Merge pull request #71 from awslabs/v0.3.1_updates

V0.3.1 updates
awslabs · Jan 25, 2024 · 86f3098 · 86f3098
2 parents 81341eb + 08096b9
commit 86f3098
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/backstage-plugins/plugins/aws-apps-backend/package.json b/backstage-plugins/plugins/aws-apps-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/plugin-aws-apps-backend-for-backstage",
   "description": "App Development for Backstage.io on AWS Backend plugin",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -48,7 +48,7 @@
     "@aws-sdk/client-sts": "^3.290.0",
     "@aws-sdk/types": "^3.290.0",
     "@aws-sdk/util-arn-parser": "^3.310.0",
-    "@aws/plugin-aws-apps-common-for-backstage": "^0.2.0",
+    "@aws/plugin-aws-apps-common-for-backstage": "^0.3.1",
     "@backstage/backend-common": "^0.20.0",
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/config": "^1.1.1",

diff --git a/backstage-plugins/plugins/aws-apps-common/package.json b/backstage-plugins/plugins/aws-apps-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/plugin-aws-apps-common-for-backstage",
   "description": "Common functionalities for the aws-apps plugin",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/backstage-plugins/plugins/aws-apps-demo/package.json b/backstage-plugins/plugins/aws-apps-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/plugin-aws-apps-demo-for-backstage",
   "description": "App Development for Backstage.io on AWS - home page and theme demo",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/backstage-plugins/plugins/aws-apps/package.json b/backstage-plugins/plugins/aws-apps/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/plugin-aws-apps-for-backstage",
   "description": "App Development for Backstage.io on AWS Frontend plugin",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
     "@aws-sdk/client-secrets-manager": "^3.294.0",
     "@aws-sdk/client-ssm": "^3.290.0",
     "@aws-sdk/util-arn-parser": "^3.310.0",
-    "@aws/plugin-aws-apps-common-for-backstage": "^0.2.0",
+    "@aws/plugin-aws-apps-common-for-backstage": "^0.3.1",
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/core-components": "^0.13.9",
     "@backstage/core-plugin-api": "^1.8.1",

diff --git a/backstage-plugins/plugins/scaffolder-backend-module-aws-apps/package.json b/backstage-plugins/plugins/scaffolder-backend-module-aws-apps/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws/plugin-scaffolder-backend-aws-apps-for-backstage",
   "description": "App Development for Backstage.io on AWS - scaffolder actions",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -48,7 +48,7 @@
     "@backstage/integration": "^1.8.0",
     "@backstage/errors": "^1.2.3",
     "@backstage/types": "^1.1.1",
-    "@aws/plugin-aws-apps-backend-for-backstage": "^0.2.0",
+    "@aws/plugin-aws-apps-backend-for-backstage": "^0.3.1",
     "lodash": "^4.17.21",
     "winston": "^3.2.1",
     "yaml": "^2.2.1"

diff --git a/build-script/backstage-install.sh b/build-script/backstage-install.sh
@@ -82,6 +82,13 @@ yarn --cwd packages/app add \
     "@backstage/plugin-home" \
     "@aws/plugin-aws-apps-demo-for-backstage@${AWS_APPS_DEMO_VERSION}"
 
+# ### PATCH BEGIN
+# TODO: remove this patch when the issue is resolved in a future Backstage release
+# provide patch to pin the version of swagger-ui-react.  See https://github.com/backstage/backstage/issues/22142
+jq '.resolutions += {"swagger-ui-react": "5.10.5"} ' package.json > package.json.tmp
+mv package.json.tmp package.json
+# ### PATCH END
+
 cd -
 # Copy/overwrite modified backstage files.
 # Note that these modifications were based on modifying Backstage 1.17 files.  

diff --git a/iac/roots/opa-platform/src/scripts/user-data.sh b/iac/roots/opa-platform/src/scripts/user-data.sh
@@ -64,7 +64,8 @@ do
     aws secretsmanager put-secret-value --secret-id opa-admin-gitlab-secrets --secret-string '{"apiToken":"'"$ADMIN_TOKEN"'", "password":"'"$ADMIN_GITLAB_PASSWORD"'", "username":"'"$ADMIN_USERNAME"'", "runnerRegistrationToken":"", "runnerId":""}'
 
     echo "Updating GitLab admin user name, password and token"
-    gitlab-rails runner "u = User.new(username: '$ADMIN_USERNAME', email: 'example@amazon.com', name: '$ADMIN_USERNAME', password: '$ADMIN_GITLAB_PASSWORD', password_confirmation: '$ADMIN_GITLAB_PASSWORD'); u.skip_confirmation!; u.admin = true; u.save!; token = User.find_by_username('$ADMIN_USERNAME').personal_access_tokens.create(scopes: [:read_user, :read_repository, :api, :read_api, :write_repository], name: '$ADMIN_USERNAME-token', expires_at: 365.days.from_now); token.set_token('$ADMIN_TOKEN'); token.save!;"
+    # Explicit namespace created to avoid validation errors.  See GitLab issue: https://gitlab.com/gitlab-org/gitlab/-/issues/439166
+    gitlab-rails runner "n = Namespace.new(name: '$ADMIN_USERNAME', description: '$ADMIN_USERNAME namespace'); u = User.new(username: '$ADMIN_USERNAME', email: '$ADMIN_USERNAME@amazon.com', name: '$ADMIN_USERNAME', password: '$ADMIN_GITLAB_PASSWORD', password_confirmation: '$ADMIN_GITLAB_PASSWORD', admin: true, namespace: n); u.skip_confirmation!; u.save!; token = User.find_by_username('$ADMIN_USERNAME').personal_access_tokens.create(scopes: [:read_user, :read_repository, :api, :read_api, :write_repository], name: '$ADMIN_USERNAME-token', expires_at: 365.days.from_now); token.set_token('$ADMIN_TOKEN'); token.save!;"
 
     GROUP_ID=$(curl --location --request POST 'localhost/api/v4/groups/' --header "PRIVATE-TOKEN: $ADMIN_TOKEN" --header 'Content-Type: application/json' --data-raw '{ "path": "aws-app", "name": "aws-app", "visibility": "internal" }' | jq .id)
     ENV_GROUP_ID=$(curl --location --request POST 'localhost/api/v4/groups/' --header "PRIVATE-TOKEN: $ADMIN_TOKEN" --header 'Content-Type: application/json' --data-raw '{ "path": "aws-environments", "name": "aws-environments", "visibility": "internal" }' | jq .id)

diff --git a/website/.gitignore b/website/.gitignore
@@ -18,3 +18,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+yarn.lock
diff --git a/website/docs/getting-started/deploy-the-platform.md b/website/docs/getting-started/deploy-the-platform.md
@@ -112,4 +112,4 @@ Prior to installing the OPA solution platform, you will need to ensure that the
 > Yes. We provide a Node.js Terraform application software template for demonstration.  You may also write your own provider with Terraform.
 <br/>
 
-For more Q & A please see our [FAQ Page](../faq.md)
+For more Q & A please see our [FAQ Page](../faq.md)