Merge pull request #1674 from philips-labs/develop

Release

Author: npalm

.github/workflows/packer-build.yml

@@ -21,7 +21,7 @@ jobs:
       image: hashicorp/packer:1.7.8
     strategy:
       matrix:
-        image: ["linux-amzn2", "windows-core-2019"]
+        image: ["linux-amzn2", "windows-core-2019", "ubuntu-focal"]
     defaults:
       run:
         working-directory: images/${{ matrix.image }}

.github/workflows/terraform.yml

@@ -9,15 +9,13 @@ on:
       - "modules/*/lambdas/**"
 
 env:
-  tf_version: "1.0."
-  tf_working_dir: "."
   AWS_REGION: eu-west-1
 jobs:
   verify_module:
     name: Verify module
     strategy:
       matrix:
-        terraform: [1.0.8]
+        terraform: [1.1.3, 'latest']
     runs-on: ubuntu-latest
     container:
       image: hashicorp/terraform:${{ matrix.terraform }}
@@ -31,7 +29,11 @@ jobs:
           touch modules/runner-binaries-syncer/lambdas/runner-binaries-syncer/runner-binaries-syncer.zip
       - name: terraform init
         run: terraform init -get -backend=false -input=false
-      - name: check terraform formatting
+      - if: contains(matrix.terraform, '1.1.')
+        name: check terraform formatting
+        run: terraform fmt -recursive -check=true -write=false
+      - if: contains(matrix.terraform, 'latest') # check formatting for the latest release but avoid failing the build
+        name: check terraform formatting
         run: terraform fmt -recursive -check=true -write=false
         continue-on-error: true
       - name: validate terraform
@@ -42,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        terraform: [0.14.3, 0.15.5, 1.0.8]
+        terraform: [1.0.11, 1.1.3, 'latest']
         example: ["default", "ubuntu", "prebuilt", "arm64", "ephemeral", "windows"]
     defaults:
       run:
@@ -54,9 +56,12 @@ jobs:
       - uses: actions/checkout@v2
       - name: terraform init
         run: terraform init -get -backend=false -input=false
-      - if: contains(matrix.terraform, '1.0.')
+      - if: contains(matrix.terraform, '1.1.')
+        name: check terraform formatting
+        run: terraform fmt -recursive -check=true -write=false
+      - if: contains(matrix.terraform, 'latest') # check formatting for the latest release but avoid failing the build
         name: check terraform formatting
         run: terraform fmt -recursive -check=true -write=false
         continue-on-error: true
-      - name: validate terraform
+      - name: validate terraform011
         run: terraform validate

.release/yarn.lock

@@ -2375,9 +2375,9 @@ node-emoji@^1.10.0:
     lodash "^4.17.21"
 
 node-fetch@^2.6.1:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd"
-  integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 

examples/arm64/main.tf

@@ -37,7 +37,7 @@ module "runners" {
 
   enable_organization_runners = false
   # Runners will automatically get the "arm64" label
-  runner_extra_labels         = "default,example"
+  runner_extra_labels = "default,example"
 
   # enable access to the runners via SSM
   enable_ssm_on_runners = true

examples/default/.terraform.lock.hcl

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.27"
+      version = ">= 3.71"
     }
     local = {
       source = "hashicorp/local"
@@ -11,5 +11,5 @@ terraform {
       source = "hashicorp/random"
     }
   }
-  required_version = ">= 0.14"
+  required_version = ">= 1"
 }

examples/default/versions.tf

@@ -1,7 +1,21 @@
 module "vpc" {
-  source = "git::https://github.com/philips-software/terraform-aws-vpc.git?ref=2.2.0"
+  source  = "terraform-aws-modules/vpc/aws"
+  version = "3.11.2"
+
+  name = "vpc-${local.environment}"
+  cidr = "10.0.0.0/16"
+
+  azs             = ["${local.aws_region}a", "${local.aws_region}b", "${local.aws_region}c"]
+  private_subnets = ["10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24"]
+  public_subnets  = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]
+
+  enable_dns_hostnames    = true
+  enable_nat_gateway      = true
+  map_public_ip_on_launch = false
+  single_nat_gateway      = true
+
+  tags = {
+    Environment = local.environment
+  }
 
-  environment                = local.environment
-  aws_region                 = local.aws_region
-  create_private_hosted_zone = false
 }

examples/default/vpc.tf

@@ -66,7 +66,7 @@ module "runners" {
 
   # configure your pre-built AMI
   # enabled_userdata = false
-  # ami_filter       = { name = ["github-runner-amzn2-x86_64-2021*"] }
+  # ami_filter       = { name = ["github-runner-amzn2-x86_64-*"] }
   # ami_owners       = [data.aws_caller_identity.current.account_id]
 
   # Enable logging

examples/ephemeral/.terraform.lock.hcl

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.27"
+      version = ">= 3.71"
     }
     local = {
       source = "hashicorp/local"
@@ -11,5 +11,5 @@ terraform {
       source = "hashicorp/random"
     }
   }
-  required_version = ">= 0.14"
+  required_version = ">= 1"
 }