Yuki Takei 3 ani în urmă
părinte
comite
42cad6b583

+ 2 - 2
packages/app/docker/codebuild/oidc.tf

@@ -1,9 +1,9 @@
 module "oidc_github" {
   source  = "unfunco/oidc-github/aws"
 
-#   iam_role_name = "github-oidc-"
+  iam_role_name = "GitHubOIDC-for-growi"
 
   github_repositories = [
-    "weseek/github",
+    "weseek/growi",
   ]
 }

+ 18 - 26
packages/app/docker/codebuild/terraform.tfstate

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.3.7",
-  "serial": 156,
+  "serial": 162,
   "lineage": "7413839f-c67c-02f5-4933-fcb84251bb29",
   "outputs": {},
   "resources": [
@@ -27,7 +27,7 @@
             "rotation_enabled": false,
             "rotation_lambda_arn": "",
             "rotation_rules": [],
-            "tags": null,
+            "tags": {},
             "tags_all": {}
           },
           "sensitive_attributes": [],
@@ -51,7 +51,7 @@
             "secret_string": "{\"KEY1\":\"CHANGE THIS\",\"KEY2\":\"CHANGE THIS\"}",
             "version_id": "C8147827-E635-4B07-80B8-B80E82FE22E5",
             "version_stages": [
-              "AWSCURRENT"
+              "AWSPREVIOUS"
             ]
           },
           "sensitive_attributes": [],
@@ -532,8 +532,8 @@
           "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "id": "3444559009",
-            "json": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Sid\": \"\",\n      \"Effect\": \"Allow\",\n      \"Action\": \"sts:AssumeRoleWithWebIdentity\",\n      \"Principal\": {\n        \"Federated\": \"arn:aws:iam::259692501178:oidc-provider/token.actions.githubusercontent.com\"\n      },\n      \"Condition\": {\n        \"StringLike\": {\n          \"token.actions.githubusercontent.com:sub\": \"repo:weseek/github:*\"\n        }\n      }\n    }\n  ]\n}",
+            "id": "2164859932",
+            "json": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Sid\": \"\",\n      \"Effect\": \"Allow\",\n      \"Action\": \"sts:AssumeRoleWithWebIdentity\",\n      \"Principal\": {\n        \"Federated\": \"arn:aws:iam::259692501178:oidc-provider/token.actions.githubusercontent.com\"\n      },\n      \"Condition\": {\n        \"StringLike\": {\n          \"token.actions.githubusercontent.com:sub\": \"repo:weseek/growi:*\"\n        }\n      }\n    }\n  ]\n}",
             "override_json": null,
             "override_policy_documents": null,
             "policy_id": null,
@@ -548,7 +548,7 @@
                   {
                     "test": "StringLike",
                     "values": [
-                      "repo:weseek/github:*"
+                      "repo:weseek/growi:*"
                     ],
                     "variable": "token.actions.githubusercontent.com:sub"
                   }
@@ -684,32 +684,27 @@
           "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "arn": "arn:aws:iam::259692501178:role/github",
-            "assume_role_policy": "{\"Statement\":[{\"Action\":\"sts:AssumeRoleWithWebIdentity\",\"Condition\":{\"StringLike\":{\"token.actions.githubusercontent.com:sub\":\"repo:weseek/github:*\"}},\"Effect\":\"Allow\",\"Principal\":{\"Federated\":\"arn:aws:iam::259692501178:oidc-provider/token.actions.githubusercontent.com\"},\"Sid\":\"\"}],\"Version\":\"2012-10-17\"}",
-            "create_date": "2023-01-16T11:34:45Z",
+            "arn": "arn:aws:iam::259692501178:role/GitHubOIDC-for-growi",
+            "assume_role_policy": "{\"Statement\":[{\"Action\":\"sts:AssumeRoleWithWebIdentity\",\"Condition\":{\"StringLike\":{\"token.actions.githubusercontent.com:sub\":\"repo:weseek/growi:*\"}},\"Effect\":\"Allow\",\"Principal\":{\"Federated\":\"arn:aws:iam::259692501178:oidc-provider/token.actions.githubusercontent.com\"},\"Sid\":\"\"}],\"Version\":\"2012-10-17\"}",
+            "create_date": "2023-01-16T12:17:26Z",
             "description": "Role assumed by the GitHub OIDC provider.",
             "force_detach_policies": false,
-            "id": "github",
+            "id": "GitHubOIDC-for-growi",
             "inline_policy": [],
-            "managed_policy_arns": [
-              "arn:aws:iam::aws:policy/ReadOnlyAccess"
-            ],
+            "managed_policy_arns": [],
             "max_session_duration": 3600,
-            "name": "github",
+            "name": "GitHubOIDC-for-growi",
             "name_prefix": "",
             "path": "/",
             "permissions_boundary": "",
-            "tags": {},
+            "tags": null,
             "tags_all": {},
-            "unique_id": "AROATY5XBDC5J7M3H4LH3"
+            "unique_id": "AROATY5XBDC5JJ573R2X5"
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "module.oidc_github.aws_iam_openid_connect_provider.github",
-            "module.oidc_github.data.aws_iam_openid_connect_provider.github",
-            "module.oidc_github.data.aws_iam_policy_document.assume_role",
-            "module.oidc_github.data.tls_certificate.github"
+            "module.oidc_github.data.aws_iam_policy_document.assume_role"
           ]
         }
       ]
@@ -725,19 +720,16 @@
           "index_key": 0,
           "schema_version": 0,
           "attributes": {
-            "id": "github-20230116113437638800000001",
+            "id": "GitHubOIDC-for-growi-20230116121718851400000001",
             "policy_arn": "arn:aws:iam::aws:policy/ReadOnlyAccess",
-            "role": "github"
+            "role": "GitHubOIDC-for-growi"
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "module.oidc_github.aws_iam_openid_connect_provider.github",
             "module.oidc_github.aws_iam_role.github",
-            "module.oidc_github.data.aws_iam_openid_connect_provider.github",
             "module.oidc_github.data.aws_iam_policy_document.assume_role",
-            "module.oidc_github.data.aws_partition.current",
-            "module.oidc_github.data.tls_certificate.github"
+            "module.oidc_github.data.aws_partition.current"
           ]
         }
       ]