From 79cc325a72d8a8fb8386e85b25c60ef243b1ad53 Mon Sep 17 00:00:00 2001
From: NRhzhao <hzhao@newrelic.com>
Date: Thu, 30 Mar 2023 13:13:25 -0700
Subject: [PATCH] chore: Update Amazon Linux test AMI from 2022 to 2023 (#895)

---
 ...lden.json => amazonlinux-2023-golden.json} |  2 +-
 .../infra-agent/amazonlinux2022-infra.json    | 35 --------
 test/definitions/ohi/linux/nginx-ubuntu.json  | 80 ++++++++++---------
 3 files changed, 43 insertions(+), 74 deletions(-)
 rename test/definitions/alerts/{amazonlinux-2022-golden.json => amazonlinux-2023-golden.json} (94%)
 delete mode 100644 test/definitions/infra-agent/amazonlinux2022-infra.json

diff --git a/test/definitions/alerts/amazonlinux-2022-golden.json b/test/definitions/alerts/amazonlinux-2023-golden.json
similarity index 94%
rename from test/definitions/alerts/amazonlinux-2022-golden.json
rename to test/definitions/alerts/amazonlinux-2023-golden.json
index d6ad2b72b..1e304b8af 100644
--- a/test/definitions/alerts/amazonlinux-2022-golden.json
+++ b/test/definitions/alerts/amazonlinux-2023-golden.json
@@ -11,7 +11,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.small",
-      "ami_name": "al2022-ami-2022.0.*-x86_64",
+      "ami_name": "al2023-ami-2023.0.*-x86_64",
       "user_name": "ec2-user"
     }
   ],
diff --git a/test/definitions/infra-agent/amazonlinux2022-infra.json b/test/definitions/infra-agent/amazonlinux2022-infra.json
deleted file mode 100644
index 618641012..000000000
--- a/test/definitions/infra-agent/amazonlinux2022-infra.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "global_tags": {
-      "owning_team": "virtuoso",
-      "Environment": "development",
-      "Department": "product",
-      "Product": "virtuoso"
-    },
-  
-    "resources": [
-      {
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.small",
-        "ami_name": "al2022-ami-2022.0.*-x86_64",
-        "user_name": "ec2-user"
-      }
-    ],
-  
-    "instrumentations": {
-      "resources": [
-        {
-          "id": "nr_infra_amazonlinux2022",
-          "resource_ids": ["host1"],
-          "provider": "newrelic",
-          "source_repository": "https://github.com/newrelic/open-install-library",
-          "deploy_script_path": "test/deploy/linux/newrelic-cli/install/roles",
-          "params": {
-            "validate_output": "Infrastructure Agent\\s+\\(installed\\)",
-            "local_recipes": true
-          }
-        }
-      ]
-    }
-  }
\ No newline at end of file
diff --git a/test/definitions/ohi/linux/nginx-ubuntu.json b/test/definitions/ohi/linux/nginx-ubuntu.json
index 342eabf45..cfaf15bd0 100644
--- a/test/definitions/ohi/linux/nginx-ubuntu.json
+++ b/test/definitions/ohi/linux/nginx-ubuntu.json
@@ -1,46 +1,50 @@
 {
-    "global_tags": {
-        "owning_team": "virtuoso",
-        "Environment": "development",
-        "Department": "product",
-        "Product": "virtuoso"
-    },
-  
-    "resources": [{
-        "id": "host1",
-        "provider": "aws",
-        "type": "ec2",
-        "size": "t3.nano",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????.1",
-        "user_name": "ubuntu"
-    }],
-  
-    "services": [{
+  "global_tags": {
+    "owning_team": "virtuoso",
+    "Environment": "development",
+    "Department": "product",
+    "Product": "virtuoso"
+  },
+  "resources": [
+    {
+      "id": "host1",
+      "provider": "aws",
+      "type": "ec2",
+      "size": "t3.micro",
+      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-????????",
+      "user_name": "ubuntu"
+    }
+  ],
+  "services": [
+    {
       "id": "nginx1",
-      "destinations": ["host1"],
+      "destinations": [
+        "host1"
+      ],
       "source_repository": "https://github.com/newrelic/open-install-library.git",
       "deploy_script_path": "test/deploy/linux/nginx/install/debian/roles",
       "port": 80,
-      "params":{
-            "create_env_var": true,
-            "open_status_url": true
+      "params": {
+        "create_env_var": true,
+        "open_status_url": true
       }
-    }],
-  
-    "instrumentations": {
-      "resources": [
-        {
-            "id": "nr_infra_nginx",
-            "resource_ids": ["host1"],
-            "provider": "newrelic",
-            "source_repository": "https://github.com/newrelic/open-install-library.git",
-            "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
-            "params": {
-                "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/nginx/linux.yml",
-                "validate_output": "(NGINX Integration)\\s+\\(installed\\)"
-            }
-        }
-        ]
     }
+  ],
+  "instrumentations": {
+    "resources": [
+      {
+        "id": "nr_infra_nginx",
+        "resource_ids": [
+          "host1"
+        ],
+        "provider": "newrelic",
+        "source_repository": "https://github.com/newrelic/open-install-library.git",
+        "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
+        "params": {
+          "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ubuntu.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/ohi/nginx/linux.yml",
+          "validate_output": "(NGINX Integration)\\s+\\(installed\\)"
+        }
+      }
+    ]
   }
-  
\ No newline at end of file
+}