Merge pull request #37 from DaPulse/update/ben/snowflake_app_name

Update/ben/snowflake app name
DaPulse · Mar 21, 2024 · 7b3f39d · 7b3f39d
2 parents 028fd07 + 961160f
commit 7b3f39d
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 280 deletions.
diff --git a/codefresh/CD/pipeline-spec.yml b/codefresh/CD/pipeline-spec.yml
diff --git a/codefresh/CD/workflow.yml b/codefresh/CD/workflow.yml
diff --git a/codefresh/CI/pipeline-spec.yml b/codefresh/CI/pipeline-spec.yml
@@ -4,6 +4,9 @@ kind: pipeline
 metadata:
   name: redash/CI
   project: redash
+  labels:
+    tags:
+      - bi-engineering
 spec:
   triggers:
     - name: staging

diff --git a/codefresh/CI/workflow.yml b/codefresh/CI/workflow.yml
@@ -5,9 +5,8 @@ stages:
   - build
   - wait-when-pr
   - staging
-#  - wait-before-prod
-#  - production
-#  - after-deployment
+  - production
+  - after-deployment
 
 steps:
   clone:
@@ -89,7 +88,7 @@ steps:
 
   approve:
     title: 'Approve Before Staging'
-    stage: 'wait-when-pr'
+    stage: wait-when-pr
     type: 'pending-approval'
     timeout:
       timeUnit: 'minutes'
@@ -120,66 +119,60 @@ steps:
     title: Deploy staging
     stage: staging
     steps:
-      staging_use1:
-        title: Deploy staging use1
+      staging_argo:
+        title: Deploy staging using argocd
         type: codefresh-run
         arguments:
-          PIPELINE_ID: redash/CD
-          TRIGGER_ID: run-stage-use1
-          BRANCH: '${{CF_BRANCH}}'
-          SHA: '${{CF_REVISION}}'
+          PIPELINE_ID: infra-core/argocd
+          TRIGGER_ID: staging-bigbrain
+          BRANCH: master
           ENABLE_NOTIFICATIONS: true
           FOLLOW_LOGS: false
+          VARIABLE:
+            - REPO_NAME=${{CF_REPO_NAME}}
+            - REVISION=${{CF_REVISION}}
+            - BUILD_ID=${{CF_BUILD_ID}}
+            - CHECK_LOCK="false"
     when:
       condition:
         any:
           isMaster: "'${{CF_BRANCH}}' == 'master'"
           isApproved: 'includes("${{STAGING_APPROVED}}", "{{STAGING_APPROVED}}") == false'
 
-#  approve_prod:
-#    type: pending-approval
-#    title: Approve Before Production
-#    description: Step description
-#    timeout:
-#      timeUnit: 'minutes'
-#      duration: 15
-#      finalState: denied
-#    fail_fast: false
-#    stage: wait-before-prod
-#    when:
-#      condition:
-#        all:
-#          isMaster: "'${{CF_BRANCH}}' == 'master'"
-#          myCondition: deploy_staging.result == 'success'
+  production:
+    type: parallel
+    title: Deploy production
+    stage: production
+    steps:
+      production_argo:
+        type: codefresh-run
+        title: 'Deploy production using ArgoCD'
+        arguments:
+          PIPELINE_ID: infra-core/argocd
+          TRIGGER_ID: production-bigbrain
+          BRANCH: master
+          ENABLE_NOTIFICATIONS: true
+          FOLLOW_LOGS: false
+          VARIABLE:
+            - REPO_NAME=${{CF_REPO_NAME}}
+            - REVISION=${{CF_REVISION}}
+            - BUILD_ID=${{CF_BUILD_ID}}
+            - CHECK_LOCK="false"
+    when:
+      condition:
+        all:
+          isMaster: "'${{CF_BRANCH}}' == 'master'"
+          myCondition: deploy_staging.result == 'success'
+
 
-#  production:
-#    type: parallel
-#    title: Deploy production
-#    stage: production
-#    steps:
-#      production_use1:
-#        title: Deploy production use1
-#        type: codefresh-run
-#        arguments:
-#          PIPELINE_ID: redash/CD
-#          TRIGGER_ID: run-prod-use1
-#          BRANCH: '${{CF_BRANCH}}'
-#          SHA: '${{CF_REVISION}}'
-#          ENABLE_NOTIFICATIONS: true
-#          FOLLOW_LOGS: false
-#    when:
-#      steps:
-#        - name: approve_prod
-#          'on':
-#            - approved
-#  push_tag:
-#    title: Push latest docker tag
-#    type: push
-#    candidate: '${{build}}'
-#    tag: latest
-#    registry: 'aws-bi-use1'
-#    stage: after-deployment
-#    when:
-#      condition:
-#        all:
-#          myCondition: production.result == 'success'
+  push_tag:
+    title: Push latest docker tag
+    type: push
+    candidate: '${{build}}'
+    tag: latest
+    registry: 'aws-bi-use1'
+    stage: after-deployment
+    when:
+      condition:
+        all:
+          myCondition: production.result == 'success'
diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py
@@ -119,9 +119,7 @@ def run_query(
             current_user.id,
             current_user.is_api_user(),
             metadata={
-                "Username": repr(current_user)
-                if current_user.is_api_user()
-                else current_user.email,
+                "Username": current_user.get_actual_user(),
                 "query_id": query_id,
             },
         )

diff --git a/redash/models/users.py b/redash/models/users.py
@@ -256,7 +256,8 @@ def get_id(self):
         ).hexdigest()
         return "{0}-{1}".format(self.id, identity)
 
-
+    def get_actual_user(self):
+        return repr(self) if self.is_api_user() else self.email
 @generic_repr("id", "name", "type", "org_id")
 class Group(db.Model, BelongsToOrgMixin):
     DEFAULT_PERMISSIONS = [

diff --git a/redash/query_runner/snowflake.py b/redash/query_runner/snowflake.py
@@ -5,6 +5,7 @@
 except ImportError:
     enabled = False
 
+from redash import __version__
 from redash.query_runner import BaseQueryRunner, register
 from redash.query_runner import (
     TYPE_STRING,
@@ -129,6 +130,7 @@ def _get_connection(self):
             account=account,
             region=region,
             host=host,
+            application="Redash/{} (Snowflake)".format(__version__.split("-")[0]),
         )
 
         return connection