Merge pull request #2071 from philips-labs/develop

Release

Author: npalm

.github/workflows/packer-build.yml

@@ -2,7 +2,7 @@ name: "Packer checks"
 on:
   push:
     branches:
-      - master
+      - main
       - develop
   pull_request:
     paths:

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release build
 on:
   push:
     branches:
-      - master
+      - main
       - develop
   workflow_dispatch:
 
@@ -75,7 +75,7 @@ jobs:
           yarn release -d --repositoryUrl https://x-access-token:[email protected]/$GITHUB_REPOSITORY.git
 
       - name: Release
-        if: github.event_name != 'pull_request' && contains('refs/heads/master', github.ref)
+        if: github.event_name != 'pull_request' && contains('refs/heads/main', github.ref)
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |

.github/workflows/terraform.yml

@@ -2,7 +2,7 @@ name: "Terraform checks"
 on:
   push:
     branches:
-      - master
+      - main
       - develop
   pull_request:
     paths-ignore:

.releaserc.json

@@ -1,7 +1,7 @@
 {
   "branches": [
     {
-      "name": "master"
+      "name": "main"
     },
     {
       "name": "develop",

examples/arm64/main.tf

@@ -19,7 +19,7 @@ module "runners" {
   vpc_id                          = module.vpc.vpc_id
   subnet_ids                      = module.vpc.private_subnets
 
-  environment = local.environment
+  prefix = local.environment
   tags = {
     Project = "ProjectX"
   }

examples/default/main.tf

@@ -19,7 +19,7 @@ module "runners" {
   vpc_id                          = module.vpc.vpc_id
   subnet_ids                      = module.vpc.private_subnets
 
-  environment = local.environment
+  prefix = local.environment
   tags = {
     Project = "ProjectX"
   }

examples/ephemeral/main.tf

@@ -16,7 +16,7 @@ module "runners" {
   vpc_id                          = module.vpc.vpc_id
   subnet_ids                      = module.vpc.private_subnets
 
-  environment = local.environment
+  prefix = local.environment
   tags = {
     Project = "ProjectX"
   }

examples/permissions-boundary/main.tf

@@ -35,7 +35,7 @@ module "runners" {
   subnet_ids  = module.vpc.private_subnets
   kms_key_arn = aws_kms_key.github.key_id
 
-  environment = local.environment
+  prefix = local.environment
   tags = {
     Project = "ProjectX"
   }

examples/prebuilt/main.tf

@@ -15,7 +15,7 @@ module "runners" {
   vpc_id                          = module.vpc.vpc_id
   subnet_ids                      = module.vpc.private_subnets
 
-  environment = local.environment
+  prefix = local.environment
 
   github_app = {
     key_base64     = var.github_app_key_base64

examples/ubuntu/main.tf

@@ -16,7 +16,7 @@ module "runners" {
   vpc_id     = module.vpc.vpc_id
   subnet_ids = module.vpc.private_subnets
 
-  environment = local.environment
+  prefix = local.environment
   tags = {
     Project = "ProjectX"
   }