@@ -56,76 +56,82 @@ argocd-image-updater test nginx --semver-constraint v1.17.x
5656argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strategy latest
5757` ,
5858 Run : func (cmd * cobra.Command , args []string ) {
59+ // Create a root context and logger for the command
60+ ctx := context .Background ()
61+ logger := log .LoggerFromContext (ctx ).WithField ("command" , "test" )
62+ ctx = log .ContextWithLogger (ctx , logger )
63+
5964 if len (args ) != 1 {
6065 cmd .HelpFunc ()(cmd , args )
61- log .Fatalf ("image needs to be specified" )
66+ logger .Fatalf ("image needs to be specified" )
6267 }
6368
6469 if err := log .SetLogLevel (logLevel ); err != nil {
65- log .Fatalf ("could not set log level to %s: %v" , logLevel , err )
70+ logger .Fatalf ("could not set log level to %s: %v" , logLevel , err )
6671 }
6772
6873 var kubeClient * kube.ImageUpdaterKubernetesClient
6974 var err error
75+
7076 if ! disableKubernetes {
71- ctx := context .Background ()
7277 kubeClient , err = argocd .GetKubeConfig (ctx , "" , kubeConfig )
7378 if err != nil {
74- log .Fatalf ("could not create K8s client: %v" , err )
79+ logger .Fatalf ("could not create K8s client: %v" , err )
7580 }
7681 }
7782
7883 img := image .NewFromIdentifier (args [0 ])
7984
85+ fields := img .GetLogFields (img .ImageAlias )
86+ imgLogger := logger .WithFields (fields )
87+ imgCtx := log .ContextWithLogger (ctx , imgLogger )
88+
8089 vc := & image.VersionConstraint {
8190 Constraint : semverConstraint ,
8291 Strategy : image .StrategySemVer ,
8392 }
8493
85- vc .Strategy = img .ParseUpdateStrategy (strategy )
94+ vc .Strategy = img .ParseUpdateStrategy (imgCtx , strategy )
8695
8796 if allowTags != "" {
88- vc .MatchFunc , vc .MatchArgs = img .ParseMatchfunc ( allowTags )
97+ vc .MatchFunc , vc .MatchArgs = img .ParseMatch ( imgCtx , allowTags )
8998 }
9099
91100 vc .IgnoreList = ignoreTags
92101
93- logCtx := img .LogContext ()
94- logCtx .Infof ("retrieving information about image" )
102+ imgLogger .Infof ("retrieving information about image" )
95103
96104 vc .Options = options .NewManifestOptions ()
97105 for _ , platform := range platforms {
98106 os , arch , variant , err := image .ParsePlatform (platform )
99107 if err != nil {
100- logCtx .Fatalf ("Could not parse platform %s: %v" , platform , err )
108+ imgLogger .Fatalf ("Could not parse platform %s: %v" , platform , err )
101109 }
102110 if os != "linux" && os != "windows" {
103- log .Warnf ("Target platform is '%s/%s', but that's not a supported container platform. Forgot --platforms?" , os , arch )
111+ imgLogger .Warnf ("Target platform is '%s/%s', but that's not a supported container platform. Forgot --platforms?" , os , arch )
104112 }
105113 vc .Options = vc .Options .WithPlatform (os , arch , variant )
106114 }
107115 vc .Options = vc .Options .WithMetadata (vc .Strategy .NeedsMetadata ())
108116
109- vc .Options .WithLogger (logCtx .AddField ("application" , "test" ))
110-
111117 if registriesConfPath != "" {
112- if err := registry .LoadRegistryConfiguration (registriesConfPath , false ); err != nil {
113- logCtx .Fatalf ("could not load registries configuration: %v" , err )
118+ if err := registry .LoadRegistryConfiguration (imgCtx , registriesConfPath , false ); err != nil {
119+ imgLogger .Fatalf ("could not load registries configuration: %v" , err )
114120 }
115121 }
116122
117- ep , err := registry .GetRegistryEndpoint (img .RegistryURL )
123+ ep , err := registry .GetRegistryEndpoint (imgCtx , img .RegistryURL )
118124 if err != nil {
119- logCtx .Fatalf ("could not get registry endpoint: %v" , err )
125+ imgLogger .Fatalf ("could not get registry endpoint: %v" , err )
120126 }
121127
122- if err := ep .SetEndpointCredentials (kubeClient .KubeClient ); err != nil {
123- logCtx .Fatalf ("could not set registry credentials: %v" , err )
128+ if err := ep .SetEndpointCredentials (imgCtx , kubeClient .KubeClient ); err != nil {
129+ imgLogger .Fatalf ("could not set registry credentials: %v" , err )
124130 }
125131
126132 checkFlag := func (f * pflag.Flag ) {
127133 if f .Name == "rate-limit" {
128- logCtx .Infof ("Overriding registry rate-limit to %d requests per second" , rateLimit )
134+ imgLogger .Infof ("Overriding registry rate-limit to %d requests per second" , rateLimit )
129135 ep .Limiter = ratelimit .New (rateLimit )
130136 }
131137 }
@@ -137,40 +143,40 @@ argocd-image-updater test nginx --allow-tags '^1.19.\d+(\-.*)*$' --update-strate
137143 if credentials != "" {
138144 credSrc , err := image .ParseCredentialSource (credentials , false )
139145 if err != nil {
140- logCtx .Fatalf ("could not parse credential definition '%s': %v" , credentials , err )
146+ imgLogger .Fatalf ("could not parse credential definition '%s': %v" , credentials , err )
141147 }
142- creds , err = credSrc .FetchCredentials (ep .RegistryAPI , kubeClient .KubeClient )
148+ creds , err = credSrc .FetchCredentials (imgCtx , ep .RegistryAPI , kubeClient .KubeClient )
143149 if err != nil {
144- logCtx .Fatalf ("could not fetch credentials: %v" , err )
150+ imgLogger .Fatalf ("could not fetch credentials: %v" , err )
145151 }
146152 username = creds .Username
147153 password = creds .Password
148154 }
149155
150156 regClient , err := registry .NewClient (ep , username , password )
151157 if err != nil {
152- logCtx .Fatalf ("could not create registry client: %v" , err )
158+ imgLogger .Fatalf ("could not create registry client: %v" , err )
153159 }
154160
155- logCtx .Infof ("Fetching available tags and metadata from registry" )
161+ imgLogger .Infof ("Fetching available tags and metadata from registry" )
156162
157- tags , err := ep .GetTags (img , regClient , vc )
163+ tags , err := ep .GetTags (imgCtx , img , regClient , vc )
158164 if err != nil {
159- logCtx .Fatalf ("could not get tags: %v" , err )
165+ imgLogger .Fatalf ("could not get tags: %v" , err )
160166 }
161167
162- logCtx .Infof ("Found %d tags in registry" , len (tags .Tags ()))
168+ imgLogger .Infof ("Found %d tags in registry" , len (tags .Tags ()))
163169
164- upImg , err := img .GetNewestVersionFromTags (vc , tags )
170+ upImg , err := img .GetNewestVersionFromTags (imgCtx , vc , tags )
165171 if err != nil {
166- logCtx .Fatalf ("could not get updateable image from tags: %v" , err )
172+ imgLogger .Fatalf ("could not get updateable image from tags: %v" , err )
167173 }
168174 if upImg == nil {
169- logCtx .Infof ("no newer version of image found" )
175+ imgLogger .Infof ("no newer version of image found" )
170176 return
171177 }
172178
173- logCtx .Infof ("latest image according to constraint is %s" , img .WithTag (upImg ))
179+ imgLogger .Infof ("latest image according to constraint is %s" , img .WithTag (upImg ))
174180 },
175181 }
176182
0 commit comments