From 4afa7fc72e73e38395246b82e003cb777d9bdbd4 Mon Sep 17 00:00:00 2001 From: diana esteves Date: Fri, 20 Sep 2024 19:34:13 +0000 Subject: [PATCH] init --- aws-ts-oidc-provider-pulumi-cloud/Pulumi.yaml | 15 ++++----------- aws-ts-oidc-provider-pulumi-cloud/README.md | 14 +++----------- aws-ts-oidc-provider-pulumi-cloud/package.json | 13 +++++++------ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/aws-ts-oidc-provider-pulumi-cloud/Pulumi.yaml b/aws-ts-oidc-provider-pulumi-cloud/Pulumi.yaml index 4632bdb67..f4a993b1f 100644 --- a/aws-ts-oidc-provider-pulumi-cloud/Pulumi.yaml +++ b/aws-ts-oidc-provider-pulumi-cloud/Pulumi.yaml @@ -3,19 +3,12 @@ description: ${DESCRIPTION} runtime: nodejs template: - description: A minimal TypeScript Pulumi program to set up AWS OIDC+Pulumi ESC + description: A minimal TypeScript Pulumi program to set up AWS OIDC config: aws:region: - description: The AWS region to deploy into + description: AWS Region default: us-west-2 - oidcIdpUrl: - description: The URL of the OIDC IdP to use - default: https://api.pulumi.com/oidc - thumbprint: - description: The thumbprint of the OIDC IdP SSL certificate. - # This is a valid AWS OIDC thumbprint as of June 2024. - default: 9e99a48a9960b14926bb7f3b02e22da2b0ab7280 escEnv: - description: The Pulumi ESC Environment to create ('.' to skip) - default: aws-oidc-env + description: Pulumi ESC Environment to create ('.' to skip) + default: auth/aws \ No newline at end of file diff --git a/aws-ts-oidc-provider-pulumi-cloud/README.md b/aws-ts-oidc-provider-pulumi-cloud/README.md index ab95e5de1..f2aac865e 100644 --- a/aws-ts-oidc-provider-pulumi-cloud/README.md +++ b/aws-ts-oidc-provider-pulumi-cloud/README.md @@ -5,7 +5,7 @@ A Pulumi template to: - Create AWS resources for AWS OIDC (IdP + Role) - Create a new Pulumi Cloud ESC Environment (optional) -Last update: July 2024 +Last update: September 2024 ## 📋 Pre-requisites @@ -32,15 +32,7 @@ Once copied to your machine, feel free to edit as needed. ## 🎬 How to run -This template will pick up the thumbprint from the URL that you set in the stack configuration. By default it will use the OIDC IDP URL for Pulumi Cloud, unless you set a different one. - -To set a different URL you can run the following command: - -```bash -pulumi config set oidcIdpUrl {url} -``` - -(where `{url}` is the URL for the OIDC IDP) +This template will pick up the thumbprint from the URL that you set in the stack configuration. By default it will use the OIDC IDP URL for Pulumi Cloud. You must also set the name of the environment that you would like to use: @@ -48,7 +40,7 @@ You must also set the name of the environment that you would like to use: pulumi config set escEnv {environment-name} ``` -(Note that `{environment-name}` must be in the format `{orgname}/environmentname}` where `orgname` can be your individual account name or the the organization that you are adding the environment to) +(Note that `{environment-name}` must be in the format `{orgname}/{project}/{environmentname}` where `orgname` can be your individual account name or the the organization that you are adding the environment to) To deploy your infrastructure, run: diff --git a/aws-ts-oidc-provider-pulumi-cloud/package.json b/aws-ts-oidc-provider-pulumi-cloud/package.json index 5f85e19aa..ca565c25c 100644 --- a/aws-ts-oidc-provider-pulumi-cloud/package.json +++ b/aws-ts-oidc-provider-pulumi-cloud/package.json @@ -2,13 +2,14 @@ "name": "aws-ts-oidc-provider-pulumi-cloud", "main": "index.ts", "devDependencies": { - "@types/node": "^20", - "typescript": "^5.4.5" + "@types/node": "^22", + "typescript": "^5.6.2" }, "dependencies": { - "@pulumi/aws": "^6.40.0", - "@pulumi/pulumi": "^3.120.0", - "@pulumi/pulumiservice": "^0.21.2", - "@pulumi/tls": "^5.0.3" + "@pulumi/aws": "^6.52.0", + "@pulumi/command": "^1.0.1", + "@pulumi/pulumi": "^3.133.0", + "@pulumi/pulumiservice": "^0.26.0", + "@pulumi/tls": "^5.0.6" } }