Merge branch 'master' into CI-14214

Ompragash · web-flow · commit 442ddcba6158 · 2024-09-25T21:18:56.000+05:30
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
@@ -17,15 +17,9 @@ manifests:
       architecture: arm64
       os: linux
       variant: v8
-  -
-    image: plugins/s3:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64
-    platform:
-      architecture: amd64
-      os: windows
-      version: 1809
   -
     image: plugins/s3:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64
     platform:
       architecture: amd64
       os: windows
-      version: ltsc2022
+      version: ltsc2022
diff --git a/plugin.go b/plugin.go
@@ -494,6 +494,7 @@ func (p *Plugin) createS3Client() *s3.S3 {
 	}
 
 	return client
+
 }
 
 func assumeRoleWithWebIdentity(sess *session.Session, roleArn, roleSessionName, idToken string) (*credentials.Credentials, error) {

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ func (p Plugin) createS3Client() s3.S3 {`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`return client`
	`497`	`+`
`497`	`498`	`}`
`498`	`499`
`499`	`500`	`func assumeRoleWithWebIdentity(sess session.Session, roleArn, roleSessionName, idToken string) (credentials.Credentials, error) {`