v1.1.0 (#601)

* Initial version
* Adding debug info
* v1.0.1 Renaming variable
* v1.1.0: Adding document on LOG_LEVEL and fault to error
Adding return parameters
* Remove env_vars_to_export, file created for testing
* Enumerate sync status
* simplify query
* updating version to reduce vuln
* updating base image
* increasing requests version to 2.31.0 to solve CVSS 6.1
---------
Signed-off-by: Laurent Rochette <[email protected]>

Author: lrochette

incubating/argocd-app-status/Dockerfile

@@ -1,4 +1,4 @@
-FROM    python:3.11.2-slim-buster
+FROM    python:3.11.3-slim-buster
 WORKDIR /app
 COPY    requirements.txt requirements.txt
 RUN     pip3 install -r requirements.txt

incubating/argocd-app-status/argocd_app_status.py

@@ -57,7 +57,7 @@ def get_runtime_ns():
 
 def get_link_to_apps_dashboard():
     runtime_ns= get_runtime_ns()
-    url_to_app = CF_URL+'/2.0/applications-dashboard/'+RUNTIME+'/'+runtime_ns+'/'+APPLICATION+'/timeline'
+    url_to_app = CF_URL+'/2.0/applications-dashboard/'+ runtime_ns +'/'+ RUNTIME +'/'+APPLICATION+'/timeline'
     return url_to_app
 
 def get_app_status():

incubating/argocd-app-status/env_vars_to_export

@@ -1,26 +1,3 @@
-fragment ApplicationShortOperationStateFragment on ApplicationOperationState {
-  message
-  phase
-  type
-  syncResult {
-    revision
-    source {
-      repoURL
-      targetRevision
-      path
-      chart
-      __typename
-    }
-    resources {
-      status
-      hookPhase
-      __typename
-    }
-    __typename
-  }
-  __typename
-}
-
 query ApplicationsStatusesQuery(
   $runtime: String!
   $name: String!
@@ -30,132 +7,12 @@ query ApplicationsStatusesQuery(
     metadata {
       runtime
       name
-      runtime
       namespace
-      created
-      uid
-      labels {
-        key
-        value
-        __typename
-      }
       cluster
       __typename
     }
     healthStatus
     syncStatus
     syncPolicy
-    isHelmApp
-    repoURL
-    revision
-    updatedAt
-    size
-    desiredManifest
-    appsRelations {
-      referencedBy {
-        kind
-        __typename
-      }
-      __typename
-    }
-    specSource {
-      repoURL
-      targetRevision
-      path
-      chart
-      __typename
-    }
-    destination {
-      name
-      server
-      namespace
-      __typename
-    }
-    status {
-      minHistoryId
-      __typename
-    }
-    source {
-      gitManifest
-      path
-      revision
-      gitSource {
-        metadata {
-          name
-          __typename
-        }
-        self {
-          repoURL
-          revision
-          path
-          __typename
-        }
-        permissions {
-          read
-          write
-          user {
-            id
-            __typename
-          }
-          __typename
-        }
-        __typename
-      }
-      __typename
-    }
-    errors {
-      __typename
-      object {
-        metadata {
-          kind
-          name
-          namespace
-          runtime
-          group
-          version
-          __typename
-        }
-        __typename
-      }
-      level
-      title
-      message
-      lastSeen
-      ... on SyncError {
-        code
-        context {
-          repoURL
-          revision
-          path
-          fileUrl
-          commitAuthor
-          commitUrl
-          commitMessage
-          commitDate
-          __typename
-        }
-        __typename
-      }
-    }
-    operationState {
-      ...ApplicationShortOperationStateFragment
-      __typename
-    }
-    sync {
-      status
-      revision
-      comparedTo {
-        source {
-          repoURL
-          targetRevision
-          path
-          chart
-          __typename
-        }
-        __typename
-      }
-      __typename
-    }
-    __typename
   }
 }

incubating/argocd-app-status/queries/get_app_status.graphql

@@ -1,6 +1,14 @@
+backoff==2.2.1
+certifi==2023.5.7
+charset-normalizer==3.1.0
+docopt==0.6.2
 gql==3.4.0
 graphql-core==3.2.3
-requests==2.28.2
-requests-toolbelt==0.10.1
-urllib3==1.26.15
+idna==3.4
 multidict==6.0.4
+pipreqs==0.4.13
+requests==2.31.0
+requests-toolbelt==0.10.1
+urllib3==1.26.16
+yarg==0.1.9
+yarl==1.9.2

incubating/argocd-app-status/requirements.txt

@@ -1,9 +1,9 @@
 kind: step-type
 metadata:
   name: argocd-app-status
-  version: 1.0.1
+  version: 1.1.1
   isPublic: true
-  description: Get Argo CD App status and return SYNC_STATUS and HEALTH_STATUS
+  description: Get Argo CD App status and return its sybc and health status
   sources:
     - 'https://github.com/codefresh-io/steps/tree/master/incubating/argocd-app-status'
   stage: incubating
@@ -49,18 +49,45 @@ spec:
           "type": "string",
           "description": "The name of the Argo CD Application to be checked"
         },
+        "LOG_LEVEL": {
+          "type": "string",
+          "description": "set the log level, e.g. 'debug', 'info', 'warn', 'error', 'critical' (default 'error')",
+          "default": "error"
+        },
         "IMAGE_NAME": {
           "type": "string",
           "default": "quay.io/codefreshplugins/argocd-app-status",
           "description": "OPTIONAL - To overwrite the image name to use"
         },
         "IMAGE_TAG": {
           "type": "string",
-          "default": "1.0.1",
+          "default": "1.1.1",
           "description": "OPTIONAL - To overwrite the tag to use"
         }
       }
     }
+  returns: |-
+    {
+        "definitions": {},
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "type": "object",
+        "additionalProperties": true,
+        "patterns": [],
+        "required": [
+          "HEALTH_STATUS",
+          "SYNC_STATUS"
+        ],
+        "properties": {
+            "HEALTH_STATUS": {
+                "type": "string",
+                "description": "The heatlh status of the application: HEALTHY, PROGRESSING, DEGRADED or SUSPENDED"
+            },
+            "SYNC_STATUS": {
+                "type": "string",
+                "description": "The synchronization status of the application: SYNCED, OUTOFSYNC, UNKNOWN."
+            }
+        }
+    }
   stepsTemplate: |-
     argocd_app_status:
       image: '[[.Arguments.IMAGE_NAME]]:[[.Arguments.IMAGE_TAG]]'