Merge pull request #2195 from wazuh/enhacement/2960-add-version-and-revision-on-artifacts

Add Wazuh version and revision into wazuh-certs-tool and config file

.github/workflows/5_pr_check.yml

@@ -40,7 +40,7 @@ jobs:
       image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
       docker_reference: ${{ github.head_ref }}
       revision: ${{ needs.prepare-variables.outputs.WAZUH_TAG_REVISION }}
-      reference: "latest"
+      commit_list: '["latest", "latest", "latest", "latest"]'
       id: ${{ github.run_id }}
       dev: true
 
@@ -109,10 +109,21 @@ jobs:
     - name: Log in to Amazon ECR
       uses: aws-actions/amazon-ecr-login@v2
 
+    - name: Download artifact_urls.yml
+      uses: actions/download-artifact@v4
+      with:
+        name: presigned-artifact-urls-${{ github.run_id }}
+        path: ./single-node/
+
+    - name: Add environment variables into GITHUB_ENV
+      run: |
+        # Export variables to the environment
+        awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' artifact_urls.yml >> "$GITHUB_ENV"
+      working-directory: ./single-node/
+
     - name: Create single node certficates
       run: |
-        wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool.sh --expires-in 3600 --region us-west-1)
+        curl -o ./wazuh-certs-tool.sh ${{ env.wazuh_certs_tool }}
-        curl -sL "$wazuh_certs_tool_url" -o ./wazuh-certs-tool.sh
         cat > config.yml <<EOF
         nodes:
           # Wazuh indexer server nodes
@@ -349,10 +360,21 @@ jobs:
     - name: Log in to Amazon ECR
       uses: aws-actions/amazon-ecr-login@v2
 
+    - name: Download artifact_urls.yml
+      uses: actions/download-artifact@v4
+      with:
+        name: presigned-artifact-urls-${{ github.run_id }}
+        path: ./multi-node/
+
+    - name: Add environment variables into GITHUB_ENV
+      run: |
+        # Export variables to the environment
+        awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' artifact_urls.yml >> "$GITHUB_ENV"
+      working-directory: ./multi-node/
+
     - name: Create multi node certficates
       run: |
-        wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool.sh --expires-in 3600 --region us-west-1)
+        curl -o ./wazuh-certs-tool.sh ${{ env.wazuh_certs_tool }}
-        curl -sL "$wazuh_certs_tool_url" -o ./wazuh-certs-tool.sh
         cat > config.yml <<EOF
         nodes:
           # Wazuh indexer server nodes

.github/workflows/Procedure_push_docker_images.yml

@@ -209,6 +209,7 @@ jobs:
             line=${line//\$\{\{ env.MANAGER_REVISION \}\}/$MANAGER_COMMIT}
             line=${line//\$\{\{ env.DASHBOARD_REVISION \}\}/$DASHBOARD_COMMIT}
             line=${line//\$\{\{ env.AGENT_REVISION \}\}/$AGENT_COMMIT}
+            line=${line//\$\{\{ env.ASSISTANT_REVISION \}\}/latest}
 
             # Append the processed line to the output file
             echo "$line" >> "$OUTPUT_FILE"

.gitignore

@@ -4,10 +4,10 @@ build-docker-images/artifacts_env.txt
 single-node/wazuh-certificates
 single-node/wazuh-certificates/*
 single-node/wazuh-certificates-tool.log
-single-node/wazuh-certs-tool.sh
+single-node/wazuh-certs-tool*.sh
-single-node/config.yml
+single-node/config*.yml
 multi-node/wazuh-certificates
 multi-node/wazuh-certificates/*
 multi-node/wazuh-certificates-tool.log
-multi-node/wazuh-certs-tool.sh
+multi-node/wazuh-certs-tool*.sh
-multi-node/config.yml
+multi-node/config*.yml

CHANGELOG.md

@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- Add Wazuh version and revision into wazuh-certs-tool and config file ([#2195](https://github.com/wazuh/wazuh-docker/pull/2195))
 - Improve S3 artifact URLs handling ([#2183](https://github.com/wazuh/wazuh-docker/pull/2183))
 - Allow building separate targets ([#2177](https://github.com/wazuh/wazuh-docker/pull/2177))
 - Add developement option when tag name is only version without stage ([#2179](https://github.com/wazuh/wazuh-docker/pull/2179))

docs/ref/getting-started/deployment/multi-node.md

@@ -21,8 +21,8 @@ This deployment utilizes the `multi-node/docker-compose.yml` file, which defines
 3.  Download the certificate creation script and config.yml file:
 
     ```bash
-    curl -sO https://packages.wazuh.com/5.0/wazuh-certs-tool.sh
+    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -sO https://packages.wazuh.com/5.0/config.yml
+    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
     ```
 
 4.  Edit the `config.yml` file with the configuration of the Wazuh components to be deployed

docs/ref/getting-started/deployment/single-node.md

@@ -21,8 +21,8 @@ This deployment uses the `single-node/docker-compose.yml` file, which defines a
 3.  Download the certificate creation script and `config.yml` file:
 
     ```bash
-    curl -sO https://packages.wazuh.com/5.0/wazuh-certs-tool.sh
+    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -sO https://packages.wazuh.com/5.0/config.yml
+    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
     ```
 
 4.  Edit the config.yml file with the configuration of the Wazuh components to be deployed

docs/ref/getting-started/requirements.md

@@ -53,7 +53,7 @@ These are general recommendations. Actual needs may vary based on the number of
 * **Docker Desktop**
     * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/windows-install/).
 * **WSL Linux distribution**
-    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not comptible with wazuh-certs-tool.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
+    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not compatible with wazuh-certs-tool-5.0.0-1.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
 * **Git Client**:
     * Required for cloning the `wazuh-docker` repository.
 * **Web Browser**: