Merge pull request #1806 from aws-observability/mergerel

Merge release/v0.45.x to terraform

Author: vasireddy99

.github/workflows/codeql-analysis.yml

@@ -1,81 +1,58 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
   push:
     branches: [ terraform ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ terraform ]
   schedule:
     - cron: '18 17 * * 6'
 
 jobs:
-  fomrat:
+  format:
     name: Format
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v2
-      with:
-        terraform_version: '1.10.3'
-    - name: Format Terraform
-      run: cd terraform && make check-fmt
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_version: '1.10.3'
+      - name: Format Terraform
+        run: cd terraform && make check-fmt
 
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
 
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'go', 'java', 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+        language: [ 'java' ]
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      if: matrix.language != 'java'
-      uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    - run: |
-       ./gradlew build
-      if: matrix.language == 'java'
-      
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Build Java
+        run: |
+          ./gradlew build
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

terraform/eks/memcached-service/memcached.tf

@@ -35,6 +35,22 @@ resource "helm_release" "bitnami" {
   chart      = "memcached"
   version    = "5.8.1"
 
+  set {
+    name  = "image.repository"
+    value = "bitnamilegacy/memcached"
+  }
+  set {
+    name  = "image.tag"
+    value = "1.6.23-debian-11-r9"
+  }
+  set {
+    name  = "metrics.image.repository"
+    value = "bitnamilegacy/memcached-exporter"
+  }
+  set {
+    name  = "metrics.image.tag"
+    value = "0.14.2-debian-11-r9"
+  }
   set {
     name  = "metrics.enabled"
     value = "true"

terraform/eks/otlp.tf

@@ -130,8 +130,8 @@ resource "kubernetes_config_map" "aoc_config_map" {
 
   data = {
     "aoc-config.yml" = module.basic_components.0.otconfig_content
-    "client.qps"    = "100"
-    "client.burst"  = "400"
+    "client.qps"     = "100"
+    "client.burst"   = "400"
   }
   depends_on = [kubernetes_service_account.sample-app-sa]
 }

terraform/eks/otlp/versions.tf

@@ -9,8 +9,8 @@ terraform {
     kubernetes = {
       version = "2.36.0"
     }
-    helm ={
-      source = "hashicorp/helm"
+    helm = {
+      source  = "hashicorp/helm"
       version = "2.17.0"
     }
     kubectl = {

terraform/eks/versions.tf

@@ -9,8 +9,8 @@ terraform {
     kubernetes = {
       version = "2.36.0"
     }
-    helm ={
-      source = "hashicorp/helm"
+    helm = {
+      source  = "hashicorp/helm"
       version = "2.17.0"
     }
     kubectl = {

terraform/testcases/otlp_mock/parameters.tfvars

@@ -5,4 +5,4 @@ sample_app = "spark"
 
 sample_app_image = "public.ecr.aws/aws-otel-test/aws-otel-java-spark:f3c87ee4c0e3fc7cd8bf6d0eb7d8e570f75ae6dc"
 
-mock_endpoint ="mocked-server:443/put-data"
+mock_endpoint = "mocked-server:443/put-data"