ci: fix aws-cli version [skip CI]

gravitee-io · Jan 16, 2025 · 30620c9 · 30620c9
1 parent 870dff2
commit 30620c9
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 12 deletions.
diff --git a/.circleci/ci/src/config.ts b/.circleci/ci/src/config.ts
@@ -19,6 +19,8 @@ const aqua = {
 
 const artifactoryUrl = 'https://odbxikk7vo-artifactory.services.clever-cloud.com';
 
+const awsCliVersion = '2.22.35';
+
 const cache = {
   prefix: 'gravitee-api-management-v10',
 };
@@ -86,8 +88,8 @@ const maven = {
 const orbs = {
   aquasec: '1.0.4',
   artifactory: '1.0.1',
-  awsCli: '2.0.6',
-  awsS3: '3.0.0',
+  awsCli: '5.1.2',
+  awsS3: '4.1.0',
   github: '1.0.5',
   gravitee: 'dev:4.5.0',
   helm: '3.0.0',
@@ -146,6 +148,7 @@ const docker = {
 export const config = {
   aqua,
   artifactoryUrl,
+  awsCliVersion,
   cache,
   dockerImages,
   executor,

diff --git a/.circleci/ci/src/jobs/job-package-bundle.ts b/.circleci/ci/src/jobs/job-package-bundle.ts
@@ -19,6 +19,7 @@ import { orbs } from '../orbs';
 import { config } from '../config';
 import { ReusedCommand } from '@circleci/circleci-config-sdk/dist/src/lib/Components/Commands/exports/Reusable';
 import { keeper } from '../orbs/keeper';
+import { awsCli } from '../orbs/aws-cli';
 import { awsS3 } from '../orbs/aws-s3';
 import { GraviteeioVersion, parse } from '../utils';
 
@@ -28,6 +29,7 @@ export class PackageBundleJob {
   public static create(dynamicConfig: Config, graviteeioVersion: string, isDryRun: boolean) {
     dynamicConfig.importOrb(keeper);
     dynamicConfig.importOrb(awsS3);
+    dynamicConfig.importOrb(awsCli);
 
     const parsedGraviteeioVersion = parse(graviteeioVersion);
 
@@ -66,6 +68,10 @@ export class PackageBundleJob {
         'secret-url': config.secrets.awsSecretAccessKey,
         'var-name': 'AWS_SECRET_ACCESS_KEY',
       }),
+      new reusable.ReusedCommand(orbs.awsCli.commands.setup, {
+        region: 'cloudfront',
+        version: `${config.awsCliVersion}`,
+      }),
       PackageBundleJob.getSyncCommand(parsedGraviteeioVersion, isDryRun),
     ]);
   }

diff --git a/.circleci/ci/src/orbs/aws-cli.ts b/.circleci/ci/src/orbs/aws-cli.ts
@@ -13,7 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { orb } from '@circleci/circleci-config-sdk';
+import { orb, parameters } from '@circleci/circleci-config-sdk';
 import { config } from '../config';
 
-export const awsCli = new orb.OrbImport('aws-cli', 'circleci', 'aws-cli', config.orbs.awsCli);
+export const awsCli = new orb.OrbImport('aws-cli', 'circleci', 'aws-cli', config.orbs.awsCli, undefined, {
+  jobs: {},
+  executors: {},
+  commands: {
+    setup: new parameters.CustomParametersList(),
+  },
+});
diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-alpha.yml
@@ -400,6 +400,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.2.0-alpha.1/dist
@@ -718,6 +721,7 @@ orbs:
   slack: circleci/[email protected]
   aquasec: gravitee-io/[email protected]
   artifactory-orb: jfrog/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
   helm: circleci/[email protected]
   gh: circleci/[email protected]
diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-dry-run.yml
@@ -402,6 +402,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.2.0/dist
@@ -708,6 +711,7 @@ orbs:
   slack: circleci/[email protected]
   aquasec: gravitee-io/[email protected]
   artifactory-orb: jfrog/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
   helm: circleci/[email protected]
   gh: circleci/[email protected]
diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-latest.yml
@@ -402,6 +402,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.2.0/dist
@@ -720,6 +723,7 @@ orbs:
   slack: circleci/[email protected]
   aquasec: gravitee-io/[email protected]
   artifactory-orb: jfrog/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
   helm: circleci/[email protected]
   gh: circleci/[email protected]
diff --git a/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/full-release/release-4-2-0-no-dry-run.yml
@@ -402,6 +402,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.2.0/dist
@@ -720,6 +723,7 @@ orbs:
   slack: circleci/[email protected]
   aquasec: gravitee-io/[email protected]
   artifactory-orb: jfrog/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
   helm: circleci/[email protected]
   gh: circleci/[email protected]
diff --git a/...eci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml b/...eci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-dry-run.yml
@@ -57,6 +57,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.1.0-alpha.1/dist
@@ -69,4 +72,5 @@ workflows:
             - cicd-orchestrator
 orbs:
   keeper: gravitee-io/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
diff --git a/.../ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml b/.../ci/src/pipelines/tests/resources/package-bundle/package-bundle-prerelease-no-dry-run.yml
@@ -57,6 +57,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.1.0-alpha.1/dist
@@ -69,4 +72,5 @@ workflows:
             - cicd-orchestrator
 orbs:
   keeper: gravitee-io/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
diff --git a/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml b/.circleci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-dry-run.yml
@@ -57,6 +57,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.1.0/dist
@@ -69,4 +72,5 @@ workflows:
             - cicd-orchestrator
 orbs:
   keeper: gravitee-io/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]
diff --git a/...eci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml b/...eci/ci/src/pipelines/tests/resources/package-bundle/package-bundle-release-no-dry-run.yml
@@ -57,6 +57,9 @@ jobs:
       - keeper/env-export:
           secret-url: keeper://3-pU56sIqcyWWw7HxhxjaQ/field/password
           var-name: AWS_SECRET_ACCESS_KEY
+      - aws-cli/setup:
+          region: cloudfront
+          version: 2.22.35
       - aws-s3/sync:
           arguments: --endpoint-url https://cellar-c2.services.clever-cloud.com --acl public-read
           from: ./release/.tmp/4.1.0/dist
@@ -69,4 +72,5 @@ workflows:
             - cicd-orchestrator
 orbs:
   keeper: gravitee-io/[email protected]
-  aws-s3: circleci/[email protected]
+  aws-s3: circleci/[email protected]
+  aws-cli: circleci/[email protected]