Merge pull request #14358 from vrothberg/todo-part-2

Todo part 2

7 files changed, 1 insertions, 16 deletions

diff --git a/libpod/events/events.go b/libpod/events/events.go
index e83c2efee..a30e0f1ca 100644
--- a/libpod/events/events.go
+++ b/libpod/events/events.go
@@ -144,8 +144,6 @@ func StringToType(name string) (Type, error) {
 }
 
 // StringToStatus converts a string to an Event Status
-// TODO if we add more events, we might consider a go-generator to
-// create the switch statement
 func StringToStatus(name string) (Status, error) {
 	switch name {
 	case Attach.String():
diff --git a/libpod/pod_top_linux.go b/libpod/pod_top_linux.go
index 83a070807..544126dcd 100644
--- a/libpod/pod_top_linux.go
+++ b/libpod/pod_top_linux.go
@@ -53,7 +53,7 @@ func (p *Pod) GetPodPidInformation(descriptors []string) ([]string, error) {
 		}
 	}
 
-	// TODO: psgo returns a [][]string to give users the ability to apply
+	// NOTE: psgo returns a [][]string to give users the ability to apply
 	//       filters on the data.  We need to change the API here to return
 	//       a [][]string if we want to make use of filtering.
 	opts := psgo.JoinNamespaceOpts{FillMappings: rootless.IsRootless()}
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 8c4dea327..76a28fadf 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -460,8 +460,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) {
 }
 
 func LoadImages(w http.ResponseWriter, r *http.Request) {
-	// TODO this is basically wrong
-	// TODO ... improve these ^ messages to something useful
 	decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder)
 	runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
 
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 419225007..3a78436d7 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -245,8 +245,6 @@ func authConfigsToAuthFile(authConfigs map[string]types.DockerAuthConfig) (strin
 	}
 	authFilePath := tmpFile.Name()
 
-	// TODO: It would be nice if c/image could dump the map at once.
-	//
 	// Now use the c/image packages to store the credentials. It's battle
 	// tested, and we make sure to use the same code as the image backend.
 	sys := types.SystemContext{AuthFilePath: authFilePath}
diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go
index 4f4b5a36a..dd489d6f1 100644
--- a/pkg/bindings/containers/archive.go
+++ b/pkg/bindings/containers/archive.go
@@ -55,8 +55,6 @@ func CopyFromArchive(ctx context.Context, nameOrID string, path string, reader i
 }
 
 // CopyFromArchiveWithOptions copy files into container
-//
-// FIXME: remove this function and make CopyFromArchive accept the option as the last parameter in podman 4.0
 func CopyFromArchiveWithOptions(ctx context.Context, nameOrID string, path string, reader io.Reader, options *CopyOptions) (entities.ContainerCopyFunc, error) {
 	conn, err := bindings.GetClient(ctx)
 	if err != nil {
diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go
index 8058a8514..0261b0250 100644
--- a/pkg/bindings/play/play.go
+++ b/pkg/bindings/play/play.go
@@ -46,7 +46,6 @@ func KubeWithBody(ctx context.Context, body io.Reader, options *KubeOptions) (*e
 		params.Set("start", strconv.FormatBool(options.GetStart()))
 	}
 
-	// TODO: have a global system context we can pass around (1st argument)
 	header, err := auth.MakeXRegistryAuthHeader(&types.SystemContext{AuthFilePath: options.GetAuthfile()}, options.GetUsername(), options.GetPassword())
 	if err != nil {
 		return nil, err
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats
index 567fa89c1..110d425d2 100644
--- a/test/system/250-systemd.bats
+++ b/test/system/250-systemd.bats
@@ -80,12 +80,6 @@ function service_cleanup() {
     run_podman logs $cname
     is "$output" ".*WAITING.*" "running is waiting for signal"
 
-    # Exercise `podman auto-update`.
-    # TODO: this will at least run auto-update code but won't perform an update
-    #       since the image didn't change.  We need to improve on that and run
-    #       an image from a local registry instead.
-    run_podman auto-update
-
     # All good. Stop service, clean up.
     # Also make sure the service is in the `inactive` state (see #11304).
     service_cleanup inactive