update and clean up github action (#73)

* update and clean up github action

* does it wooorrrk, does it work

* use self for testing

Author: davidbloss

.github/workflows/test.yml

@@ -12,14 +12,16 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Report Deploy with Docker
-        uses: OpsLevel/report-deploy-github-action@${{ github.sha }}
+        uses: ./
         with:
           integration_url: ${{ secrets.DEPLOY_INTEGRATION_URL }}
           service: "report_deploy_github_action"
           use_docker: "true"
       - name: Report Deploy with CLI
-        uses: OpsLevel/report-deploy-github-action@${{ github.sha }}
+        uses: ./
         with:
           integration_url: ${{ secrets.DEPLOY_INTEGRATION_URL }}
           service: "report_deploy_github_action"

README.md

@@ -36,6 +36,10 @@ The deployer name who created the event - Default: `${GITHUB_ACTOR}`
 
 The deployer email who create the event - Default: ""
 
+### `deploy_url`
+
+The deploy url that OpsLevel points to - Default: `${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}`
+
 ### `deduplication_id`
 
 An identifier that can be used to deduplicate deployments - Default: `${GITHUB_RUN_ID}`

action.yml

@@ -20,6 +20,10 @@ inputs:
     description: 'The deployer name who created the event'
     required: false
     default: ${{ github.actor }}
+  deploy_url:
+    description: 'The deploy url that OpsLevel points to'
+    required: false
+    default: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   description:
     description: 'The description or release notes for the event'
     required: false
@@ -50,6 +54,7 @@ runs:
         integration_url: ${{ inputs.integration_url }}
         deduplication_id: ${{ inputs.deduplication_id }}
         deployer_email: ${{ inputs.deployer_email }}
+        deploy_url: ${{ inputs.deploy_url }}
         deployer_name: ${{ inputs.deployer_name }}
         description: ${{ inputs.description }}
         environment: ${{ inputs.environment }}
@@ -66,23 +71,16 @@ runs:
       run: |
         echo ::add-mask::$INTEGRATION_URL
         cat <<EOF > data.yaml
-        service: "$SERVICE"
-        description": "$DESCRIPTION"
-        environment": "$ENVIRONMENT"
-        deploy-number": "$NUMBER"
-        deploy-url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-        dedup-id": "$DEDUPLICATION_ID"
+        service: "${{ inputs.service }}"
+        description: "${{ inputs.description }}"
+        environment: "${{ inputs.environment }}"
+        deploy-number: "${{ inputs.number }}"
+        deploy-url: "${{ inputs.deploy_url}}"
+        dedup-id: "${{ inputs.deduplication_id }}"
         deployer:
-          name: "$DEPLOYER_NAME"
-          email: "$DEPLOYER_EMAIL"
+          name: "${{ inputs.deployer_name }}"
+          email: "${{ inputs.deployer_email }}"
         EOF
-        opslevel create deploy -i "$INTEGRATION_URL" -f .
+        opslevel create deploy -i "${INTEGRATION_URL}" -f .
       env:
-        DESCRIPTION: ${{ inputs.description }}
-        DEPLOYER_EMAIL: ${{ inputs.deployer_email }}
-        DEPLOYER_NAME: ${{ inputs.deployer_name }}
-        DEDUPLICATION_ID: ${{ inputs.deduplication_id }}
-        ENVIRONMENT: ${{ inputs.environment }}
         INTEGRATION_URL: ${{ inputs.integration_url }}
-        NUMBER: ${{ inputs.number }}
-        SERVICE: ${{ inputs.service }}

with-docker/action.yml

@@ -8,35 +8,30 @@ inputs:
   integration_url:
     description: 'The OpsLevel deploy integration url'
     required: true
-    default: ''
   service:
     description: 'The service alias for the event'
-    required: false
-    default: ''
+    required: true
   description:
     description: 'The description or release notes for the event'
-    required: false
-    default: ''
+    required: true
   environment:
     description: 'The environment for the event'
-    required: false
-    default: ''
+    required: true
   number:
     description: 'The deploy number for the event - Default: ${GITHUB_RUN_NUMBER}'
-    required: false
-    default: ''
+    required: true
   deployer_name:
     description: 'The deployer name who created the event - Default: ${GITHUB_ACTOR}'
-    required: false
-    default: ''
+    required: true
   deployer_email:
     description: 'The deployer email who created the event'
-    required: false
-    default: ''
+    required: true
+  deploy_url:
+    description: 'The deployer email who created the event'
+    required: true
   deduplication_id:
     description: 'An identifier that can be used to deduplicate deployments'
-    required: false
-    default: ''
+    required: true
 runs:
   using: 'docker'
   image: 'Dockerfile'

with-docker/entrypoint.sh

@@ -1,22 +1,17 @@
 #!/bin/sh -l
 
-OPSLEVEL_FILE=./opslevel.yml
-if test -f "$OPSLEVEL_FILE"; then
-  OPSLEVEL_SERVICE=$(cat ./opslevel.yml | grep "name:" | awk '{gsub("name:",""); print}' | xargs)
-fi
-
 cat <<EOF > data.yaml
-service: "${SERVICE:-${OPSLEVEL_SERVICE}}"
-description: "${DESCRIPTION}"
-environment: "${ENVIRONMENT}"
-deploy-number: "${NUMBER}"
-deploy-url: "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-dedup-id: "${DEDUPLICATION_ID}"
+service: "${INPUT_SERVICE}"
+description: "${INPUT_DESCRIPTION}"
+environment: "${INPUT_ENVIRONMENT}"
+deploy-number: "${INPUT_NUMBER}"
+deploy-url: "${INPUT_DEPLOY_URL}"
+dedup-id: "${INPUT_DEDUPLICATION_ID}"
 deployer:
-  name: "${DEPLOYER_NAME}"
-  email: "${DEPLOYER_EMAIL}"
+  name: "${INPUT_DEPLOYER_NAME}"
+  email: "${INPUT_DEPLOYER_EMAIL}"
 EOF
 
-opslevel create deploy -i "$INTEGRATION_URL" -f .
+opslevel create deploy -i "$INPUT_INTEGRATION_URL" -f .
 
 rm data.yaml