fix: onhost infra provision (NR-428719) (#1384)

Author: danielorihuela

.github/workflows/nightly.yml

@@ -77,18 +77,17 @@ jobs:
           local_packages_path: "/srv/dist/"
           apt_skip_mirror: true
 
- # TODO: enable back when tackling <https://new-relic.atlassian.net/browse/NR-428719>
- # onhost-e2e:
- #   uses: ./.github/workflows/component_onhost_e2e.yaml
- #   needs: [ upload-packages-s3 ]
- #   with:
- #     UNIQUE_NAME: "nightly:e2e"
- #     EC2_FILTERS: '[\"ubuntu22.04\"]'
- #     REPOSITORY_ENDPOINT: "http://nr-downloads-ohai-testing.s3-website-us-east-1.amazonaws.com/preview"
- #     PACKAGE_VERSION: 0.100.${{ github.run_id }}
- #   secrets:
- #     AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
- #     AWS_VPC_SUBNET: ${{ secrets.AWS_VPC_SUBNET }}
+  onhost-e2e:
+    uses: ./.github/workflows/component_onhost_e2e.yaml
+    needs: [ upload-packages-s3 ]
+    with:
+      UNIQUE_NAME: "nightly:e2e"
+      EC2_FILTERS: '[\"ubuntu22.04\"]'
+      REPOSITORY_ENDPOINT: "http://nr-downloads-ohai-testing.s3-website-us-east-1.amazonaws.com/preview"
+      PACKAGE_VERSION: 0.100.${{ github.run_id }}
+    secrets:
+      AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
+      AWS_VPC_SUBNET: ${{ secrets.AWS_VPC_SUBNET }}
 
   k8s-e2e-tests:
     name: K8s e2e tests
@@ -145,22 +144,19 @@ jobs:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
       AWS_VPC_SUBNET: ${{ secrets.AWS_VPC_SUBNET }}
 
-# TODO: enable back when tackling <https://new-relic.atlassian.net/browse/NR-428719>
-#  onhost_canaries:
-#    uses: ./.github/workflows/component_onhost_canaries.yml
-#    needs: [ build-packages ]
-#    with:
-#      environment: staging
-#      operation: apply
-#    secrets:
-#      AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
-#      AWS_VPC_SUBNET: ${{ secrets.AWS_VPC_SUBNET }}
+  onhost_canaries:
+    uses: ./.github/workflows/component_onhost_canaries.yml
+    needs: [ build-packages ]
+    with:
+      environment: staging
+      operation: apply
+    secrets:
+      AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
+      AWS_VPC_SUBNET: ${{ secrets.AWS_VPC_SUBNET }}
 
   notify-failure:
     if: ${{ always() && failure() }}
-    #needs: [ onhost-e2e, k8s_canaries, security-image, security-source-code, build-image, build-packages, k8s-e2e-tests ]
-    # TODO: and onhost-e2e back when tackling <https://new-relic.atlassian.net/browse/NR-428719> and also add on-host canaries
-    needs: [ k8s_canaries, security-image, security-source-code, build-image, build-packages, k8s-e2e-tests ]
+    needs: [ onhost-e2e, k8s_canaries, security-image, security-source-code, build-image, build-packages, k8s-e2e-tests ]
     runs-on: ubuntu-latest
     steps:
     - name: Notify failure via Slack

test/onhost-canaries/terraform/backend.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.48"
+      version = ">= 5.48,  < 6.0"
     }
 
     newrelic = {

test/provision/terraform/terraform.backend.tf.dist

@@ -8,4 +8,11 @@ terraform {
     key    = "agent_control-pipeline/TAG_OR_UNIQUE_NAME"
     region = "us-east-2"
   }
-}
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 5.48,  < 6.0"
+    }
+  }
+}