From 78d870924a74cb4572de0abf40d9515cb905dfba Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Fri, 15 Mar 2024 12:14:43 -0400
Subject: [PATCH 1/8] Implementing helm integration tests for
 amazon-cloudwatch-observability

---
 ...h-observability-helm-integration-test.yaml |  78 ++++
 .../terraform/basic_components/main.tf        |  25 ++
 .../terraform/basic_components/output.tf      |  14 +
 .../terraform/common/main.tf                  |   6 +
 .../terraform/common/output.tf                |  14 +
 .../terraform/helm/main.tf                    | 132 +++++++
 .../terraform/helm/providers.tf               |  12 +
 .../terraform/helm/variables.tf               |  33 ++
 .../validator/validateResources_test.go       | 337 ++++++++++++++++++
 9 files changed, 651 insertions(+)
 create mode 100644 .github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/basic_components/main.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/basic_components/output.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/common/main.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/common/output.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/helm/main.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/helm/providers.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
 create mode 100644 integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go

diff --git a/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml b/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
new file mode 100644
index 0000000..8ca6621
--- /dev/null
+++ b/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
@@ -0,0 +1,78 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+name: Run Integration Test for Amazon CloudWatch Observability Helm Chart
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  TERRAFORM_AWS_ASSUME_ROLE: ${{ secrets.TERRAFORM_AWS_ASSUME_ROLE }}
+  AWS_DEFAULT_REGION: us-west-2
+
+jobs:
+  HelmChartsIntegrationTest:
+    name: HelmChartsIntegrationTest
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Generate testing id
+        run: echo TESTING_ID="${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.TERRAFORM_AWS_ASSUME_ROLE }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+
+      #  local directory to store the kubernetes config
+      - name: Create kubeconfig directory
+        run: mkdir -p ${{ github.workspace }}/../../../.kube
+
+      - name: Set KUBECONFIG environment variable
+        run: echo KUBECONFIG="${{ github.workspace }}/../../../.kube/config" >> $GITHUB_ENV
+
+      - name: Verify Terraform version
+        run: terraform --version
+
+      - name: Terraform apply
+        uses: nick-fields/retry@v2
+        with:
+          max_attempts: 1
+          timeout_minutes: 60 # EKS takes about 20 minutes to spin up a cluster and service on the cluster
+          retry_wait_seconds: 5
+          command: |
+            cd integration-tests/amazon-cloudwatch-observability/terraform/helm
+            terraform init
+            if terraform apply -auto-approve \
+                -var="kube_dir=${{ github.workspace }}/../../../.kube"; then
+              terraform destroy -auto-approve
+            else
+              terraform destroy -auto-approve && exit 1
+            fi
+
+      - name: Terraform destroy
+        if: ${{ cancelled() || failure() }}
+        uses: nick-fields/retry@v2
+        with:
+          max_attempts: 3
+          timeout_minutes: 8
+          retry_wait_seconds: 5
+          command: |
+            cd integration-tests/amazon-cloudwatch-observability/terraform/helm
+            terraform destroy --auto-approve
\ No newline at end of file
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/main.tf b/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/main.tf
new file mode 100644
index 0000000..5c022d1
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/main.tf
@@ -0,0 +1,25 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+module "common" {
+  source = "../common"
+}
+
+data "aws_iam_role" "cwagent_iam_role" {
+  name = module.common.cwa_iam_role
+}
+
+data "aws_vpc" "vpc" {
+  default = true
+}
+
+data "aws_subnets" "public_subnet_ids" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.vpc.id]
+  }
+}
+
+data "aws_security_group" "security_group" {
+  name = module.common.vpc_security_group
+}
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/output.tf b/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/output.tf
new file mode 100644
index 0000000..d2ba45c
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/basic_components/output.tf
@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+output "security_group" {
+  value = data.aws_security_group.security_group.id
+}
+
+output "public_subnet_ids" {
+  value = data.aws_subnets.public_subnet_ids.ids
+}
+
+output "role_arn" {
+  value = data.aws_iam_role.cwagent_iam_role.arn
+}
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/common/main.tf b/integration-tests/amazon-cloudwatch-observability/terraform/common/main.tf
new file mode 100644
index 0000000..1416d77
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/common/main.tf
@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+resource "random_id" "testing_id" {
+  byte_length = 8
+}
\ No newline at end of file
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/common/output.tf b/integration-tests/amazon-cloudwatch-observability/terraform/common/output.tf
new file mode 100644
index 0000000..545c911
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/common/output.tf
@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+output "testing_id" {
+  value = random_id.testing_id.hex
+}
+
+output "cwa_iam_role" {
+  value = "cwa-e2e-iam-role"
+}
+
+output "vpc_security_group" {
+  value = "vpc_security_group"
+}
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/helm/main.tf b/integration-tests/amazon-cloudwatch-observability/terraform/helm/main.tf
new file mode 100644
index 0000000..3cfc632
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/helm/main.tf
@@ -0,0 +1,132 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+module "common" {
+  source = "../common"
+}
+
+module "basic_components" {
+  source = "../basic_components"
+}
+
+locals {
+  aws_eks  = "aws eks --region ${var.region}"
+  cluster_name = var.cluster_name != "" ? var.cluster_name : "cwagent-helm-chart-integ"
+}
+
+data "aws_eks_cluster_auth" "this" {
+  name = aws_eks_cluster.this.name
+}
+
+resource "aws_eks_cluster" "this" {
+  name     = "${local.cluster_name}-${module.common.testing_id}"
+  role_arn = module.basic_components.role_arn
+  version  = var.k8s_version
+  vpc_config {
+    subnet_ids         = module.basic_components.public_subnet_ids
+    security_group_ids = [module.basic_components.security_group]
+  }
+}
+
+# EKS Node Groups
+resource "aws_eks_node_group" "this" {
+  cluster_name    = aws_eks_cluster.this.name
+  node_group_name = "${local.cluster_name}-node"
+  node_role_arn   = aws_iam_role.node_role.arn
+  subnet_ids      = module.basic_components.public_subnet_ids
+
+  scaling_config {
+    desired_size = 1
+    max_size     = 1
+    min_size     = 1
+  }
+
+  ami_type       = "AL2_x86_64"
+  capacity_type  = "ON_DEMAND"
+  disk_size      = 20
+  instance_types = ["t3a.medium"]
+
+  depends_on = [
+    aws_iam_role_policy_attachment.node_CloudWatchAgentServerPolicy,
+    aws_iam_role_policy_attachment.node_AmazonEC2ContainerRegistryReadOnly,
+    aws_iam_role_policy_attachment.node_AmazonEKS_CNI_Policy,
+    aws_iam_role_policy_attachment.node_AmazonEKSWorkerNodePolicy
+  ]
+}
+
+# EKS Node IAM Role
+resource "aws_iam_role" "node_role" {
+  name = "${local.cluster_name}-Worker-Role-${module.common.testing_id}"
+
+  assume_role_policy = <<POLICY
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "ec2.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+POLICY
+}
+
+resource "aws_iam_role_policy_attachment" "node_AmazonEKSWorkerNodePolicy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"
+  role       = aws_iam_role.node_role.name
+}
+
+resource "aws_iam_role_policy_attachment" "node_AmazonEKS_CNI_Policy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
+  role       = aws_iam_role.node_role.name
+}
+
+resource "aws_iam_role_policy_attachment" "node_AmazonEC2ContainerRegistryReadOnly" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
+  role       = aws_iam_role.node_role.name
+}
+
+resource "aws_iam_role_policy_attachment" "node_CloudWatchAgentServerPolicy" {
+  policy_arn = "arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy"
+  role       = aws_iam_role.node_role.name
+}
+
+resource "null_resource" "kubectl" {
+  depends_on = [
+    aws_eks_cluster.this,
+    aws_eks_node_group.this
+  ]
+  provisioner "local-exec" {
+    command = <<-EOT
+      ${local.aws_eks} update-kubeconfig --name ${aws_eks_cluster.this.name}
+      ${local.aws_eks} list-clusters --output text
+      ${local.aws_eks} describe-cluster --name ${aws_eks_cluster.this.name} --output text
+    EOT
+  }
+}
+
+resource "helm_release" "this" {
+  depends_on = [
+    null_resource.kubectl
+  ]
+  name = "amazon-cloudwatch-observability"
+  namespace = "amazon-cloudwatch"
+  create_namespace = true
+  chart      = "${var.helm_dir}"
+  set {
+    name  = "region"
+    value = "${var.region}"
+  }
+}
+
+resource "null_resource" "validator" {
+  depends_on = [
+    helm_release.this
+  ]
+  provisioner "local-exec" {
+    command = "go test ${var.test_dir} -v"
+  }
+}
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/helm/providers.tf b/integration-tests/amazon-cloudwatch-observability/terraform/helm/providers.tf
new file mode 100644
index 0000000..26082ec
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/helm/providers.tf
@@ -0,0 +1,12 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+provider "aws" {
+  region = var.region
+}
+
+provider "helm" {
+  kubernetes {
+    config_path = "${var.kube_dir}/config"
+  }
+}
\ No newline at end of file
diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
new file mode 100644
index 0000000..8fa78a5
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
@@ -0,0 +1,33 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+variable "region" {
+  type    = string
+  default = "us-west-2"
+}
+
+variable "k8s_version" {
+  type    = string
+  default = "1.29"
+}
+
+# eks addon and helm tests are similar
+variable "test_dir" {
+  type    = string
+  default = "../validator"
+}
+
+variable "helm_dir" {
+  type    = string
+  default = "../../../charts/amazon-cloudwatch-observability"
+}
+
+variable "kube_dir" {
+  type    = string
+  default = "~/.kube"
+}
+
+variable "cluster_name" {
+  type    = string
+  default = "cwagent-helm-chart-integ"
+}
diff --git a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
new file mode 100644
index 0000000..08860b7
--- /dev/null
+++ b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
@@ -0,0 +1,337 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package validator
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	arv1 "k8s.io/api/admissionregistration/v1"
+	appsV1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/api/core/v1"
+	rbacV1 "k8s.io/api/rbac/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
+)
+
+const (
+	nameSpace        = "amazon-cloudwatch"
+	addOnName        = "amazon-cloudwatch-observability"
+	agentName        = "cloudwatch-agent"
+	operatorName     = addOnName + "-controller-manager"
+	fluentBitName    = "fluent-bit"
+	dcgmExporterName = "dcgm-exporter"
+	podNameRegex     = "(" + agentName + "|" + operatorName + "|" + fluentBitName + ")-*"
+	serviceNameRegex = agentName + "(-headless|-monitoring)?|" + addOnName + "-webhook-service|" + dcgmExporterName + "-service"
+)
+
+func TestOperatorOnEKs(t *testing.T) {
+	userHomeDir, err := os.UserHomeDir()
+	if err != nil {
+		t.Fatalf("error getting user home dir: %v\n", err)
+	}
+	kubeConfigPath := filepath.Join(userHomeDir, ".kube", "config")
+	t.Logf("Using kubeconfig: %s\n", kubeConfigPath)
+
+	kubeConfig, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
+	if err != nil {
+		t.Fatalf("Error getting kubernetes config: %v\n", err)
+	}
+
+	clientSet, err := kubernetes.NewForConfig(kubeConfig)
+
+	if err != nil {
+		t.Fatalf("error getting kubernetes config: %v\n", err)
+	}
+
+	// Validating the "amazon-cloudwatch" namespace creation as part of EKS addon
+	namespace, err := GetNameSpace(nameSpace, clientSet)
+	assert.NoError(t, err)
+	assert.Equal(t, nameSpace, namespace.Name)
+
+	//Validating the number of pods and status
+	pods, err := ListPods(nameSpace, clientSet)
+	assert.NoError(t, err)
+	assert.Len(t, pods.Items, 3)
+	for _, pod := range pods.Items {
+		fmt.Println("pod name: " + pod.Name + " namespace:" + pod.Namespace)
+		assert.Contains(t, []v1.PodPhase{v1.PodRunning, v1.PodPending}, pod.Status.Phase)
+		// matches
+		// - cloudwatch-agent-*
+		// - amazon-cloudwatch-observability-controller-manager-*
+		// - fluent-bit-*
+		if match, _ := regexp.MatchString(podNameRegex, pod.Name); !match {
+			assert.Fail(t, "Cluster Pods are not created correctly")
+		}
+	}
+
+	//Validating the services
+	services, err := ListServices(nameSpace, clientSet)
+	assert.NoError(t, err)
+	assert.Len(t, services.Items, 5)
+	for _, service := range services.Items {
+		fmt.Println("service name: " + service.Name + " namespace:" + service.Namespace)
+		// matches
+		// - amazon-cloudwatch-observability-webhook-service
+		// - cloudwatch-agent
+		// - cloudwatch-agent-headless
+		// - cloudwatch-agent-monitoring
+		// - dcgm-exporter-service
+		if match, _ := regexp.MatchString(serviceNameRegex, service.Name); !match {
+			assert.Fail(t, "Cluster Service is not created correctly")
+		}
+	}
+
+	//Validating the Deployment
+	deployments, err := ListDeployments(nameSpace, clientSet)
+	assert.NoError(t, err)
+	for _, deployment := range deployments.Items {
+		fmt.Println("deployment name: " + deployment.Name + " namespace:" + deployment.Namespace)
+	}
+	assert.Len(t, deployments.Items, 1)
+	// matches
+	// - amazon-cloudwatch-observability-controller-manager
+	assert.Equal(t, addOnName+"-controller-manager", deployments.Items[0].Name)
+	for _, deploymentCondition := range deployments.Items[0].Status.Conditions {
+		fmt.Println("deployment condition type: " + deploymentCondition.Type)
+	}
+	assert.Equal(t, appsV1.DeploymentAvailable, deployments.Items[0].Status.Conditions[0].Type)
+
+	//Validating the Daemon Sets
+	daemonSets, err := ListDaemonSets(nameSpace, clientSet)
+	assert.NoError(t, err)
+	assert.Len(t, daemonSets.Items, 3)
+	for _, daemonSet := range daemonSets.Items {
+		fmt.Println("daemonSet name: " + daemonSet.Name + " namespace:" + daemonSet.Namespace)
+		// matches
+		// - cloudwatch-agent
+		// - fluent-bit
+		// - dcgm-exporter (this can be removed in the future)
+		if match, _ := regexp.MatchString(agentName+"|fluent-bit|dcgm-exporter", daemonSet.Name); !match {
+			assert.Fail(t, "DaemonSet is not created correctly")
+		}
+	}
+
+	// Validating Service Accounts
+	serviceAccounts, err := ListServiceAccounts(nameSpace, clientSet)
+	assert.NoError(t, err)
+	for _, sa := range serviceAccounts.Items {
+		fmt.Println("serviceAccounts name: " + sa.Name + " namespace:" + sa.Namespace)
+	}
+	// searches
+	// - amazon-cloudwatch-observability-controller-manager
+	// - cloudwatch-agent
+	// - dcgm-exporter-service-acct
+	assert.True(t, validateServiceAccount(serviceAccounts, addOnName+"-controller-manager"))
+	assert.True(t, validateServiceAccount(serviceAccounts, agentName))
+	assert.True(t, validateServiceAccount(serviceAccounts, dcgmExporterName+"-service-acct"))
+
+	//Validating ClusterRoles
+	clusterRoles, err := ListClusterRoles(clientSet)
+	assert.NoError(t, err)
+	// searches
+	// - amazon-cloudwatch-observability-manager-role
+	// - cloudwatch-agent-role
+	assert.True(t, validateClusterRoles(clusterRoles, addOnName+"-manager-role"))
+	assert.True(t, validateClusterRoles(clusterRoles, agentName+"-role"))
+
+	//Validating Roles
+	roles, err := ListRoles(nameSpace, clientSet)
+	assert.NoError(t, err)
+	// searches
+	// - dcgm-exporter-role
+	assert.True(t, validateRoles(roles, dcgmExporterName+"-role"))
+
+	//Validating ClusterRoleBinding
+	clusterRoleBindings, err := ListClusterRoleBindings(clientSet)
+	assert.NoError(t, err)
+	// searches
+	// - amazon-cloudwatch-observability-manager-rolebinding
+	// - cloudwatch-agent-role-binding
+	assert.True(t, validateClusterRoleBindings(clusterRoleBindings, addOnName+"-manager-rolebinding"))
+	assert.True(t, validateClusterRoleBindings(clusterRoleBindings, agentName+"-role-binding"))
+
+	//Validating RoleBinding
+	roleBindings, err := ListRoleBindings(nameSpace, clientSet)
+	assert.NoError(t, err)
+	// searches
+	// - dcgm-exporter-role-binding
+	assert.True(t, validateRoleBindings(roleBindings, dcgmExporterName+"-role-binding"))
+
+	//Validating MutatingWebhookConfiguration
+	mutatingWebhookConfigurations, err := ListMutatingWebhookConfigurations(clientSet)
+	assert.NoError(t, err)
+	assert.Len(t, mutatingWebhookConfigurations.Items[0].Webhooks, 5)
+	// searches
+	// - amazon-cloudwatch-observability-mutating-webhook-configuration
+	assert.Equal(t, addOnName+"-mutating-webhook-configuration", mutatingWebhookConfigurations.Items[0].Name)
+
+	//Validating ValidatingWebhookConfiguration
+	validatingWebhookConfigurations, err := ListValidatingWebhookConfigurations(clientSet)
+	assert.NoError(t, err)
+	assert.Len(t, validatingWebhookConfigurations.Items[0].Webhooks, 4)
+	// searches
+	// - amazon-cloudwatch-observability-validating-webhook-configuration
+	assert.Equal(t, addOnName+"-validating-webhook-configuration", validatingWebhookConfigurations.Items[0].Name)
+}
+
+func validateServiceAccount(serviceAccounts *v1.ServiceAccountList, serviceAccountName string) bool {
+	for _, serviceAccount := range serviceAccounts.Items {
+		if serviceAccount.Name == serviceAccountName {
+			return true
+		}
+	}
+	return false
+}
+
+func validateClusterRoles(clusterRoles *rbacV1.ClusterRoleList, clusterRoleName string) bool {
+	for _, clusterRole := range clusterRoles.Items {
+		if clusterRole.Name == clusterRoleName {
+			return true
+		}
+	}
+	return false
+}
+
+func validateRoles(roles *rbacV1.RoleList, roleName string) bool {
+	for _, role := range roles.Items {
+		if role.Name == roleName {
+			return true
+		}
+	}
+	return false
+}
+
+func validateClusterRoleBindings(clusterRoleBindings *rbacV1.ClusterRoleBindingList, clusterRoleBindingName string) bool {
+	for _, clusterRoleBinding := range clusterRoleBindings.Items {
+		if clusterRoleBinding.Name == clusterRoleBindingName {
+			return true
+		}
+	}
+	return false
+}
+
+func validateRoleBindings(roleBindings *rbacV1.RoleBindingList, roleBindingName string) bool {
+	for _, roleBinding := range roleBindings.Items {
+		if roleBinding.Name == roleBindingName {
+			return true
+		}
+	}
+	return false
+}
+
+func ListPods(namespace string, client kubernetes.Interface) (*v1.PodList, error) {
+	pods, err := client.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting pods: %v\n", err)
+		return nil, err
+	}
+	return pods, nil
+}
+
+func GetNameSpace(namespace string, client kubernetes.Interface) (*v1.Namespace, error) {
+	ns, err := client.CoreV1().Namespaces().Get(context.Background(), namespace, metav1.GetOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting namespace: %v\n", err)
+		return nil, err
+	}
+	return ns, nil
+}
+
+func ListServices(namespace string, client kubernetes.Interface) (*v1.ServiceList, error) {
+	namespaces, err := client.CoreV1().Services(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting Services: %v\n", err)
+		return nil, err
+	}
+	return namespaces, nil
+}
+
+func ListDeployments(namespace string, client kubernetes.Interface) (*appsV1.DeploymentList, error) {
+	deployments, err := client.AppsV1().Deployments(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting Deploymets: %v\n", err)
+		return nil, err
+	}
+	return deployments, nil
+}
+
+func ListDaemonSets(namespace string, client kubernetes.Interface) (*appsV1.DaemonSetList, error) {
+	daemonSets, err := client.AppsV1().DaemonSets(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting DaemonSets: %v\n", err)
+		return nil, err
+	}
+	return daemonSets, nil
+}
+
+func ListServiceAccounts(namespace string, client kubernetes.Interface) (*v1.ServiceAccountList, error) {
+	serviceAccounts, err := client.CoreV1().ServiceAccounts(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting ServiceAccounts: %v\n", err)
+		return nil, err
+	}
+	return serviceAccounts, nil
+}
+
+func ListClusterRoles(client kubernetes.Interface) (*rbacV1.ClusterRoleList, error) {
+	clusterRoles, err := client.RbacV1().ClusterRoles().List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting ClusterRoles: %v\n", err)
+		return nil, err
+	}
+	return clusterRoles, nil
+}
+
+func ListRoles(namespace string, client kubernetes.Interface) (*rbacV1.RoleList, error) {
+	roles, err := client.RbacV1().Roles(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting Roles: %v\n", err)
+		return nil, err
+	}
+	return roles, nil
+}
+
+func ListClusterRoleBindings(client kubernetes.Interface) (*rbacV1.ClusterRoleBindingList, error) {
+	clusterRoleBindings, err := client.RbacV1().ClusterRoleBindings().List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting ClusterRoleBindings: %v\n", err)
+		return nil, err
+	}
+	return clusterRoleBindings, nil
+}
+
+func ListRoleBindings(namespace string, client kubernetes.Interface) (*rbacV1.RoleBindingList, error) {
+	roleBindings, err := client.RbacV1().RoleBindings(namespace).List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting RoleBindings: %v\n", err)
+		return nil, err
+	}
+	return roleBindings, nil
+}
+
+func ListMutatingWebhookConfigurations(client kubernetes.Interface) (*arv1.MutatingWebhookConfigurationList, error) {
+	mutatingWebhookConfigurations, err := client.AdmissionregistrationV1().MutatingWebhookConfigurations().List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting MutatingWebhookConfigurations: %v\n", err)
+		return nil, err
+	}
+	return mutatingWebhookConfigurations, nil
+}
+
+func ListValidatingWebhookConfigurations(client kubernetes.Interface) (*arv1.ValidatingWebhookConfigurationList, error) {
+	validatingWebhookConfigurations, err := client.AdmissionregistrationV1().ValidatingWebhookConfigurations().List(context.Background(), metav1.ListOptions{})
+	if err != nil {
+		err = fmt.Errorf("error getting ValidatingWebhookConfigurations: %v\n", err)
+		return nil, err
+	}
+	return validatingWebhookConfigurations, nil
+}

From 569d76cab9908b6dcaf4ea23f7e14baf4b95909e Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Fri, 15 Mar 2024 12:21:13 -0400
Subject: [PATCH 2/8] Implementing helm integration tests for
 amazon-cloudwatch-observability

---
 .../amazon-cloudwatch-observability-helm-integration-test.yaml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml b/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
index 8ca6621..f108c8b 100644
--- a/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
+++ b/.github/workflows/amazon-cloudwatch-observability-helm-integration-test.yaml
@@ -5,7 +5,7 @@ name: Run Integration Test for Amazon CloudWatch Observability Helm Chart
 on:
   push:
     branches:
-      - main
+      - helm-tests*
   workflow_dispatch:
 
 concurrency:

From edbaf6772523dcb210e3e1ae9da1a4dce84956fa Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Fri, 15 Mar 2024 12:44:00 -0400
Subject: [PATCH 3/8] Implementing helm integration tests for
 amazon-cloudwatch-observability

---
 .../amazon-cloudwatch-observability/terraform/helm/variables.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
index 8fa78a5..9a4c928 100644
--- a/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
@@ -19,7 +19,7 @@ variable "test_dir" {
 
 variable "helm_dir" {
   type    = string
-  default = "../../../charts/amazon-cloudwatch-observability"
+  default = "../../../../charts/amazon-cloudwatch-observability"
 }
 
 variable "kube_dir" {

From f82f525fb671529de89f466ff020c70ec371416e Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Fri, 15 Mar 2024 16:13:41 -0400
Subject: [PATCH 4/8] Adding go.mod

---
 go.mod |  50 ++++++++++++++++++
 go.sum | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 go.mod
 create mode 100644 go.sum

diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..5eabaf2
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,50 @@
+module github.com/aws-observability/helm-charts
+
+go 1.21.4
+
+require (
+	github.com/stretchr/testify v1.9.0
+	k8s.io/api v0.29.2
+	k8s.io/apimachinery v0.29.2
+	k8s.io/client-go v0.29.2
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..5a938e3
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,156 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
+github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
+github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
+golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=
+k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0=
+k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8=
+k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
+k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg=
+k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA=
+k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
+k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From c9608d407b8dd5872498fd101773a295f29c0697 Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Mon, 18 Mar 2024 11:26:10 -0400
Subject: [PATCH 5/8] fixing test directory

---
 .../amazon-cloudwatch-observability/terraform/helm/variables.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
index 9a4c928..048b924 100644
--- a/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
+++ b/integration-tests/amazon-cloudwatch-observability/terraform/helm/variables.tf
@@ -14,7 +14,7 @@ variable "k8s_version" {
 # eks addon and helm tests are similar
 variable "test_dir" {
   type    = string
-  default = "../validator"
+  default = "../../validator"
 }
 
 variable "helm_dir" {

From bad38a63d4bab977afc123237f38de583359076b Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Mon, 18 Mar 2024 12:36:42 -0400
Subject: [PATCH 6/8] fixing test directory

---
 .../validator/validateResources_test.go                          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
index 08860b7..f4b794c 100644
--- a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
+++ b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
@@ -60,6 +60,7 @@ func TestOperatorOnEKs(t *testing.T) {
 	//Validating the number of pods and status
 	pods, err := ListPods(nameSpace, clientSet)
 	assert.NoError(t, err)
+	fmt.Println("pod list length: " + string(len(pods.Items)))
 	assert.Len(t, pods.Items, 3)
 	for _, pod := range pods.Items {
 		fmt.Println("pod name: " + pod.Name + " namespace:" + pod.Namespace)

From 193e1a7037f9c66a47823edaefad98b1d427ccd2 Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Mon, 18 Mar 2024 13:37:09 -0400
Subject: [PATCH 7/8] removing error log line

---
 .../validator/validateResources_test.go                        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
index f4b794c..a1f53ad 100644
--- a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
+++ b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
@@ -60,8 +60,7 @@ func TestOperatorOnEKs(t *testing.T) {
 	//Validating the number of pods and status
 	pods, err := ListPods(nameSpace, clientSet)
 	assert.NoError(t, err)
-	fmt.Println("pod list length: " + string(len(pods.Items)))
-	assert.Len(t, pods.Items, 3)
+	//assert.Len(t, pods.Items, 3)
 	for _, pod := range pods.Items {
 		fmt.Println("pod name: " + pod.Name + " namespace:" + pod.Namespace)
 		assert.Contains(t, []v1.PodPhase{v1.PodRunning, v1.PodPending}, pod.Status.Phase)

From 33a825ac863f3d36b5f5f65d8f0481fe21aa9228 Mon Sep 17 00:00:00 2001
From: Mitali Salvi <mitsalvi@amazon.com>
Date: Mon, 18 Mar 2024 15:59:12 -0400
Subject: [PATCH 8/8] removing error log line--2

---
 charts/amazon-cloudwatch-observability/values.yaml            | 4 ++--
 .../validator/validateResources_test.go                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index d36be3a..dc3251f 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -40,7 +40,7 @@ manager:
   name:
   image:
     repository: cloudwatch-agent-operator
-    tag: 1.0.4
+    tag: 1.1.0
     repositoryDomainMap:
       public: public.ecr.aws/cloudwatch-agent
       cn-north-1: 934860584483.dkr.ecr.cn-north-1.amazonaws.com.cn
@@ -51,7 +51,7 @@ manager:
     java:
       repositoryDomain: public.ecr.aws/aws-observability
       repository: adot-autoinstrumentation-java
-      tag: v1.31.1
+      tag: v1.32.1
     python:
       repositoryDomain: public.ecr.aws/aws-observability
       repository: adot-autoinstrumentation-python
diff --git a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
index a1f53ad..08860b7 100644
--- a/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
+++ b/integration-tests/amazon-cloudwatch-observability/validator/validateResources_test.go
@@ -60,7 +60,7 @@ func TestOperatorOnEKs(t *testing.T) {
 	//Validating the number of pods and status
 	pods, err := ListPods(nameSpace, clientSet)
 	assert.NoError(t, err)
-	//assert.Len(t, pods.Items, 3)
+	assert.Len(t, pods.Items, 3)
 	for _, pod := range pods.Items {
 		fmt.Println("pod name: " + pod.Name + " namespace:" + pod.Namespace)
 		assert.Contains(t, []v1.PodPhase{v1.PodRunning, v1.PodPending}, pod.Status.Phase)