make https optional

quizlet · Dec 1, 2023 · 5a8db72 · 5a8db72
1 parent 4267297
commit 5a8db72
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 40 deletions.
diff --git a/action.yml b/action.yml
@@ -19,6 +19,14 @@ inputs:
     description: Extra arguments to pass to the argocd CLI
     default: --grpc-web
     required: false
+  plaintext: 
+    description: Whether to use HTTPS
+    default: false
+    required: false
+  environment: 
+    description: Name of env to use in the diff title posted to the PR
+    default: legacy
+    required: false
 runs:
   using: 'node12'
   main: 'dist/index.js'
diff --git a/dist/index.js b/dist/index.js
@@ -1697,7 +1697,12 @@ core.info(githubToken);
 const ARGOCD_SERVER_URL = core.getInput('argocd-server-url');
 const ARGOCD_TOKEN = core.getInput('argocd-token');
 const VERSION = core.getInput('argocd-version');
-const EXTRA_CLI_ARGS = core.getInput('argocd-extra-cli-args');
+const ENV = core.getInput('environment');
+const PLAINTEXT = core.getBooleanInput('plaintext');
+let EXTRA_CLI_ARGS = core.getInput('argocd-extra-cli-args');
+if (PLAINTEXT) {
+    EXTRA_CLI_ARGS += ' --plaintext';
+}
 const octokit = github.getOctokit(githubToken);
 function execCommand(command, options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -1739,7 +1744,11 @@ function setupArgoCDCommand() {
 }
 function getApps() {
     return __awaiter(this, void 0, void 0, function* () {
-        const url = `https://${ARGOCD_SERVER_URL}/api/v1/applications?fields=items.metadata.name,items.spec.source.path,items.spec.source.repoURL,items.spec.source.targetRevision,items.spec.source.helm,items.spec.source.kustomize,items.status.sync.status`;
+        let protocol = 'https';
+        if (PLAINTEXT) {
+            protocol = 'http';
+        }
+        const url = `${protocol}://${ARGOCD_SERVER_URL}/api/v1/applications`;
         core.info(`Fetching apps from: ${url}`);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let responseJson;
@@ -1754,7 +1763,8 @@ function getApps() {
             core.error(e);
         }
         return responseJson.items.filter(app => {
-            return (app.spec.source.repoURL.includes(`${github.context.repo.owner}/${github.context.repo.repo}`) && (app.spec.source.targetRevision === 'master' || app.spec.source.targetRevision === 'main'));
+            let targetPrimary = app.spec.source.targetRevision === 'master' || app.spec.source.targetRevision === 'main';
+            return (app.spec.source.repoURL.includes(`${github.context.repo.owner}/${github.context.repo.repo}`) && targetPrimary);
         });
     });
 }
@@ -1797,7 +1807,7 @@ ${diff}
 ---
 `);
         const output = scrubSecrets(`
-## ArgoCD Diff for commit [\`${shortCommitSha}\`](${commitLink})
+## ArgoCD Diff on ${ENV} for commit [\`${shortCommitSha}\`](${commitLink})
 _Updated at ${new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angeles' })} PT_
   ${diffOutput.join('\n')}
 
@@ -1812,18 +1822,8 @@ _Updated at ${new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angele
             owner,
             repo
         });
-        const existingComment = commentsResponse.data.find(d => d.body.includes('ArgoCD Diff for'));
-        // Existing comments should be updated even if there are no changes this round in order to indicate that
-        if (existingComment) {
-            octokit.rest.issues.updateComment({
-                owner,
-                repo,
-                comment_id: existingComment.id,
-                body: output
-            });
-            // Only post a new comment when there are changes
-        }
-        else if (diffs.length) {
+        // Only post a new comment when there are changes
+        if (diffs.length) {
             octokit.rest.issues.createComment({
                 issue_number: github.context.issue.number,
                 owner,

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/main.ts b/src/main.ts
@@ -36,7 +36,12 @@ core.info(githubToken);
 const ARGOCD_SERVER_URL = core.getInput('argocd-server-url');
 const ARGOCD_TOKEN = core.getInput('argocd-token');
 const VERSION = core.getInput('argocd-version');
-const EXTRA_CLI_ARGS = core.getInput('argocd-extra-cli-args');
+const ENV = core.getInput('environment');
+const PLAINTEXT = core.getBooleanInput('plaintext');
+let EXTRA_CLI_ARGS = core.getInput('argocd-extra-cli-args');
+if (PLAINTEXT) {
+  EXTRA_CLI_ARGS += ' --plaintext';
+}
 
 const octokit = github.getOctokit(githubToken);
 
@@ -84,7 +89,11 @@ async function setupArgoCDCommand(): Promise<(params: string) => Promise<ExecRes
 }
 
 async function getApps(): Promise<App[]> {
-  const url = `https://${ARGOCD_SERVER_URL}/api/v1/applications?fields=items.metadata.name,items.spec.source.path,items.spec.source.repoURL,items.spec.source.targetRevision,items.spec.source.helm,items.spec.source.kustomize,items.status.sync.status`;
+  let protocol = 'https';
+  if (PLAINTEXT) {
+    protocol = 'http';
+  }
+  const url = `${protocol}://${ARGOCD_SERVER_URL}/api/v1/applications`;
   core.info(`Fetching apps from: ${url}`);
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let responseJson: any;
@@ -99,10 +108,11 @@ async function getApps(): Promise<App[]> {
   }
 
   return (responseJson.items as App[]).filter(app => {
+    let targetPrimary = app.spec.source.targetRevision === 'master' || app.spec.source.targetRevision === 'main'
     return (
       app.spec.source.repoURL.includes(
         `${github.context.repo.owner}/${github.context.repo.repo}`
-      ) && (app.spec.source.targetRevision === 'master' || app.spec.source.targetRevision === 'main')
+      ) && targetPrimary
     );
   });
 }
@@ -125,8 +135,8 @@ App: [\`${app.metadata.name}\`](https://${ARGOCD_SERVER_URL}/applications/${app.
 YAML generation: ${error ? ' Error 🛑' : 'Success 🟢'}
 App sync status: ${app.status.sync.status === 'Synced' ? 'Synced ✅' : 'Out of Sync ⚠️ '}
 ${
-  error
-    ? `
+      error
+        ? `
 **\`stderr:\`**
 \`\`\`
 ${error.stderr}
@@ -137,12 +147,12 @@ ${error.stderr}
 ${JSON.stringify(error.err)}
 \`\`\`
 `
-    : ''
-}
+        : ''
+      }
 
 ${
-  diff
-    ? `
+      diff
+        ? `
 <details>
 
 \`\`\`diff
@@ -151,14 +161,14 @@ ${diff}
 
 </details>
 `
-    : ''
-}
+        : ''
+      }
 ---
 `
   );
 
   const output = scrubSecrets(`
-## ArgoCD Diff for commit [\`${shortCommitSha}\`](${commitLink})
+## ArgoCD Diff on ${ENV} for commit [\`${shortCommitSha}\`](${commitLink})
 _Updated at ${new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angeles' })} PT_
   ${diffOutput.join('\n')}
 
@@ -175,18 +185,8 @@ _Updated at ${new Date().toLocaleString('en-US', { timeZone: 'America/Los_Angele
     repo
   });
 
-  const existingComment = commentsResponse.data.find(d => d.body!.includes('ArgoCD Diff for'));
-
-  // Existing comments should be updated even if there are no changes this round in order to indicate that
-  if (existingComment) {
-    octokit.rest.issues.updateComment({
-      owner,
-      repo,
-      comment_id: existingComment.id,
-      body: output
-    });
-    // Only post a new comment when there are changes
-  } else if (diffs.length) {
+  // Only post a new comment when there are changes
+  if (diffs.length) {
     octokit.rest.issues.createComment({
       issue_number: github.context.issue.number,
       owner,