Fix duplicate LogzioRegion Helm set & fix release workflow permissions

- Fix for duplicated `logzio-k8s-telemetry.secrets.LogzioRegion` Helm set flag - Fix release workflow permissions
logzio · Jul 22, 2024 · ea4f496 · ea4f496
1 parent c7b52a1
commit ea4f496
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 24 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -17,11 +17,17 @@ jobs:
   update_version:
     name: Update Version
     runs-on: macos-latest
+    permissions:
+      contents: write  # Allows pushing changes to the repository
+      issues: write    # Allows creating issues
+      packages: write  # Allows accessing and publishing packages
+      pull-requests: write  # Allows creating and managing pull requests
+      actions: write  # Allows updating GitHub Action workflows
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Increase Version
         run: |
           version=$(cat ./version | grep -o -e '[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}')
@@ -61,9 +67,16 @@ jobs:
     name: Create Release
     runs-on: ubuntu-latest
     needs: update_version
+    permissions:
+      contents: write  # Allows pushing changes to the repository
+      issues: write    # Allows creating issues
+      packages: write  # Allows accessing and publishing packages
+      pull-requests: write  # Allows creating and managing pull requests
+      actions: write  # Allows updating GitHub Action workflows    
+      attestations: write  # Allows adding and updating artifact attestations
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Update version file
         run: |
           echo "${{ needs.update_version.outputs.VERSION }}" >./version

diff --git a/config-templates/helm.json b/config-templates/helm.json
@@ -24,8 +24,14 @@
   },
   {
     "template": "  --set metricsOrTraces.enabled=true \\",
-    "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]"
-  },
+    "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]",
+    "conditionalTemplates": [
+      {
+        "condition": "(datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]) && datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value)",
+        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
+      }
+    ]
+  },  
   {
     "template": "  --set logzio-k8s-telemetry.metrics.enabled=true \\",
     "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]",
@@ -85,9 +91,6 @@
         "template": "  --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\",
         "targetElement":
         "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value"
-      },
-      {
-        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
       }
     ]
   },
@@ -98,9 +101,6 @@
       {
         "template": "  --set logzio-k8s-telemetry.secrets.TracesToken='<<LOGZIO_TRACING_SHIPPING_TOKEN>>' \\"
       },
-      {
-        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
-      },
       {
         "template": "  --set logzio-k8s-telemetry.spm.enabled=true \\",
         "targetElement": "capabilities[?(@ == 'SPM')]",

diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/metrics/functions.ps1
@@ -416,6 +416,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource

diff --git a/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/aks/kubernetes/telemetry/traces/functions.ps1
@@ -108,6 +108,11 @@ function Build-LogzioRegionHelmSet {
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
 
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
+
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource
     Write-Log $script:LogLevelDebug $Message
@@ -230,4 +235,4 @@ function Build-LogzioSpmTokenHelmSet {
 
     Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'"
     Write-TaskPostRun "`$script:HelmSets += '$HelmSet'"
-}
+}
diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/metrics/functions.ps1
@@ -352,7 +352,6 @@ function Build-EnableObjectLogsHelmSet {
     Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'"
     Write-TaskPostRun "`$script:HelmSets += '$HelmSet'"
 }
-
 # Builds Logz.io region Helm set
 # Input:
 #   FuncArgs - Hashtable {ListenerUrl = $script:ListenerUrl}
@@ -365,6 +364,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource

diff --git a/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/digitalocean/kubernetes/telemetry/traces/functions.ps1
@@ -107,6 +107,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource
@@ -230,4 +235,4 @@ function Build-LogzioSpmTokenHelmSet {
 
     Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'"
     Write-TaskPostRun "`$script:HelmSets += '$HelmSet'"
-}
+}
diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/metrics/functions.ps1
@@ -388,6 +388,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource

diff --git a/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/eks/kubernetes/telemetry/traces/functions.ps1
@@ -107,6 +107,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource
@@ -230,4 +235,4 @@ function Build-LogzioSpmTokenHelmSet {
 
     Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'"
     Write-TaskPostRun "`$script:HelmSets += '$HelmSet'"
-}
+}
diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/metrics/functions.ps1
@@ -364,6 +364,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepMetrics $script:LogScriptMetrics $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource

diff --git a/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1 b/datasources/windows/kubernetes/gke/kubernetes/telemetry/traces/functions.ps1
@@ -107,6 +107,11 @@ function Build-LogzioRegionHelmSet {
 
     $local:ExitCode = 3
     $local:FuncName = $MyInvocation.MyCommand.Name
+
+    # Check if LogzioRegion already exists in HelmSets
+    if ($script:LogHelmSets -match "logzio-k8s-telemetry\.secrets\.LogzioRegion=[^ ]+") {
+        return
+    }
 
     $local:Message = 'Building Logz.io region Helm set ...'
     Send-LogToLogzio $script:LogLevelDebug $Message $script:LogStepTraces $script:LogScriptTraces $FuncName $script:AgentId $script:Platform $script:Subtype $script:CurrentDataSource
@@ -230,4 +235,4 @@ function Build-LogzioSpmTokenHelmSet {
 
     Write-TaskPostRun "`$script:LogHelmSets += '$HelmSet'"
     Write-TaskPostRun "`$script:HelmSets += '$HelmSet'"
-}
+}
diff --git a/resources-linux/k8s/datasource_logs_utils.bash b/resources-linux/k8s/datasource_logs_utils.bash
@@ -84,7 +84,7 @@ function build_logzio_logs_region_helm_set {
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
     write_log "$LOG_LEVEL_DEBUG" "$message"
 
-    local helm_set=" --set logzio-logs-collector.secrets.LogzioRegion=$region"
+    local helm_set=" --set logzio-logs-collector.secrets.logzioRegion=$region"
 
     message="Logz.io region Helm set is '$helm_set'"
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
@@ -322,4 +322,4 @@ function build_deploy_events_environment_id_helm_set {
 
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
-}
+}
diff --git a/resources-linux/k8s/datasource_metrics_utils.bash b/resources-linux/k8s/datasource_metrics_utils.bash
@@ -199,6 +199,11 @@ function build_enable_object_logs_helm_set {
 function build_logzio_region_helm_set {
     local func_name="${FUNCNAME[0]}"
 
+    # Check if LogzioRegion already exists in HelmSets
+    if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then
+        return
+    fi
+
     local message='Building Logz.io region Helm set ...'
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
     write_log "$LOG_LEVEL_DEBUG" "$message"
@@ -241,4 +246,3 @@ function build_logzio_object_logs_token_helm_set {
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
 }
-
diff --git a/resources-linux/k8s/datasource_traces_utils.bash b/resources-linux/k8s/datasource_traces_utils.bash
@@ -58,6 +58,11 @@ function build_logzio_traces_token_helm_set {
 #   HELM_SETS - Contains all the Helm sets
 function build_logzio_region_helm_set {
     local func_name="${FUNCNAME[0]}"
+
+    # Check if LogzioRegion already exists in HelmSets
+    if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then
+        return
+    fi
 
     local message='Building Logz.io region Helm set ...'
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
@@ -123,4 +128,4 @@ function build_logzio_spm_token_helm_set {
 
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
-}
+}
diff --git a/resources-mac/k8s/datasource_logs_utils.bash b/resources-mac/k8s/datasource_logs_utils.bash
@@ -84,7 +84,7 @@ function build_logzio_logs_region_helm_set {
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
     write_log "$LOG_LEVEL_DEBUG" "$message"
 
-    local helm_set=" --set logzio-logs-collector.secrets.LogzioRegion=$region"
+    local helm_set=" --set logzio-logs-collector.secrets.logzioRegion=$region"
 
     message="Logz.io region Helm set is '$helm_set'"
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
@@ -322,4 +322,4 @@ function build_deploy_events_environment_id_helm_set {
 
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
-}
+}
diff --git a/resources-mac/k8s/datasource_metrics_utils.bash b/resources-mac/k8s/datasource_metrics_utils.bash
@@ -198,6 +198,11 @@ function build_enable_object_logs_helm_set {
 #   HELM_SETS - Contains all the Helm sets
 function build_logzio_region_helm_set {
     local func_name="${FUNCNAME[0]}"
+
+    # Check if LogzioRegion already exists in HelmSets
+    if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then
+        return
+    fi
 
     local message='Building Logz.io region Helm set ...'
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_METRICS" "$LOG_SCRIPT_METRICS" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
@@ -240,4 +245,4 @@ function build_logzio_object_logs_token_helm_set {
 
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
-}
+}
diff --git a/resources-mac/k8s/datasource_traces_utils.bash b/resources-mac/k8s/datasource_traces_utils.bash
@@ -59,6 +59,11 @@ function build_logzio_traces_token_helm_set {
 function build_logzio_region_helm_set {
     local func_name="${FUNCNAME[0]}"
 
+    # Check if LogzioRegion already exists in HelmSets
+    if [[ "$LOG_HELM_SETS" =~ logzio-k8s-telemetry.secrets.LogzioRegion ]]; then
+        return
+    fi
+
     local message='Building Logz.io region Helm set ...'
     send_log_to_logzio "$LOG_LEVEL_DEBUG" "$message" "$LOG_STEP_TRACES" "$LOG_SCRIPT_TRACES" "$func_name" "$AGENT_ID" "$PLATFORM" "$SUB_TYPE" "$CURRENT_DATA_SOURCE"
     write_log "$LOG_LEVEL_DEBUG" "$message"
@@ -123,4 +128,4 @@ function build_logzio_spm_token_helm_set {
 
     write_task_post_run "LOG_HELM_SETS+='$helm_set'"
     write_task_post_run "HELM_SETS+='$helm_set'"
-}
+}