Show org secrets and variables in the sidebar

Author: joshmgross

package.json

@@ -335,7 +335,7 @@
         },
         {
           "command": "github-actions.settings.secret.copy",
-          "when": "viewItem == 'repo-secret'",
+          "when": "viewItem == 'repo-secret' || viewItem == 'env-secret' || viewItem == 'org-secret'",
           "group": "context"
         },
         {
@@ -360,12 +360,12 @@
         },
         {
           "command": "github-actions.settings.variable.copy-name",
-          "when": "viewItem == 'repo-variable' || viewItem == 'env-variable'",
+          "when": "viewItem == 'repo-variable' || viewItem == 'env-variable' || viewItem == 'org-variable'",
           "group": "context"
         },
         {
           "command": "github-actions.settings.variable.copy-value",
-          "when": "viewItem == 'repo-variable' || viewItem == 'env-variable'",
+          "when": "viewItem == 'repo-variable' || viewItem == 'env-variable' || viewItem == 'org-variable'",
           "group": "context"
         },
         {

src/commands/secrets/updateSecret.ts

@@ -1,13 +1,12 @@
 import * as vscode from "vscode";
-import {RepoSecret} from "../../model";
 import {encodeSecret} from "../../secrets";
 import {SecretCommandArgs} from "../../treeViews/settings/secretNode";
 
 export function registerUpdateSecret(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.commands.registerCommand("github-actions.settings.secret.update", async (args: SecretCommandArgs) => {
       const gitHubContext = args.gitHubRepoContext;
-      const secret: RepoSecret = args.secret;
+      const secret = args.secret;
 
       const value = await vscode.window.showInputBox({
         prompt: "Enter the new secret value"

src/model.ts

@@ -42,4 +42,8 @@ export type EnvironmentSecret = OctokitData<"listEnvironmentSecrets", "secrets">
 
 export type EnvironmentVariable = OctokitData<"listEnvironmentVariables", "variables">;
 
+export type OrgSecret = {name: string};
+
+export type OrgVariable = {name: string; value: string};
+
 export type SelfHostedRunner = OctokitData<"listSelfHostedRunnersForRepo", "runners">;

src/treeViews/settings.ts

@@ -13,6 +13,8 @@ import {RepoVariablesNode} from "./settings/repoVariablesNode";
 import {VariablesNode} from "./settings/variablesNode";
 import {EnvironmentSecretsNode} from "./settings/environmentSecretsNode";
 import {EnvironmentVariablesNode} from "./settings/environmentVariablesNode";
+import {OrgVariablesNode} from "./settings/orgVariablesNode";
+import {OrgSecretsNode} from "./settings/orgSecretsNode";
 
 export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExplorerNode> {
   private _onDidChangeTreeData = new vscode.EventEmitter<SettingsExplorerNode | null>();
@@ -50,21 +52,21 @@ export class SettingsTreeProvider implements vscode.TreeDataProvider<SettingsExp
     // Secrets
     //
     if (element instanceof SecretsNode) {
-      return [new RepoSecretsNode(element.gitHubRepoContext)];
+      return element.nodes;
     }
 
-    if (element instanceof RepoSecretsNode) {
+    if (element instanceof RepoSecretsNode || element instanceof OrgSecretsNode) {
       return element.getSecrets();
     }
 
     //
     // Variables
     //
     if (element instanceof VariablesNode) {
-      return [new RepoVariablesNode(element.gitHubRepoContext)];
+      return element.nodes;
     }
 
-    if (element instanceof RepoVariablesNode) {
+    if (element instanceof RepoVariablesNode || element instanceof OrgVariablesNode) {
       return element.getVariables();
     }
 

src/treeViews/settings/orgSecretsNode.ts

@@ -0,0 +1,32 @@
+import * as vscode from "vscode";
+import {GitHubRepoContext} from "../../git/repository";
+import {OrgSecret} from "../../model";
+import {EmptyNode} from "./emptyNode";
+import {SecretNode} from "./secretNode";
+
+export class OrgSecretsNode extends vscode.TreeItem {
+  constructor(public readonly gitHubRepoContext: GitHubRepoContext) {
+    super("Organization Secrets", vscode.TreeItemCollapsibleState.Collapsed);
+
+    this.contextValue = "org-secrets";
+  }
+
+  async getSecrets(): Promise<vscode.TreeItem[]> {
+    let secrets: OrgSecret[] = [];
+    try {
+      secrets = await this.gitHubRepoContext.client.paginate("GET /repos/{owner}/{repo}/actions/organization-secrets", {
+        owner: this.gitHubRepoContext.owner,
+        repo: this.gitHubRepoContext.name,
+        per_page: 100
+      });
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
+
+    if (!secrets || secrets.length === 0) {
+      return [new EmptyNode("No organization secrets shared with this repository")];
+    }
+
+    return secrets.map(s => new SecretNode(this.gitHubRepoContext, s, undefined, true));
+  }
+}

src/treeViews/settings/orgVariablesNode.ts

@@ -0,0 +1,35 @@
+import * as vscode from "vscode";
+import {GitHubRepoContext} from "../../git/repository";
+import {OrgVariable} from "../../model";
+import {EmptyNode} from "./emptyNode";
+import {VariableNode} from "./variableNode";
+
+export class OrgVariablesNode extends vscode.TreeItem {
+  constructor(public readonly gitHubRepoContext: GitHubRepoContext) {
+    super("Organization Variables", vscode.TreeItemCollapsibleState.Collapsed);
+
+    this.contextValue = "org-variables";
+  }
+
+  async getVariables(): Promise<vscode.TreeItem[]> {
+    let variables: OrgVariable[] = [];
+    try {
+      variables = await this.gitHubRepoContext.client.paginate(
+        "GET /repos/{owner}/{repo}/actions/organization-variables",
+        {
+          owner: this.gitHubRepoContext.owner,
+          repo: this.gitHubRepoContext.name,
+          per_page: 100
+        }
+      );
+    } catch (e) {
+      await vscode.window.showErrorMessage((e as Error).message);
+    }
+
+    if (!variables || variables.length === 0) {
+      return [new EmptyNode("No organization variables shared with this repository")];
+    }
+
+    return variables.map(s => new VariableNode(this.gitHubRepoContext, s, undefined, true));
+  }
+}

src/treeViews/settings/secretNode.ts

@@ -1,17 +1,21 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
-import {Environment, EnvironmentSecret, RepoSecret} from "../../model";
+import {Environment, EnvironmentSecret, OrgSecret, RepoSecret} from "../../model";
 
 export type SecretCommandArgs = Pick<SecretNode, "gitHubRepoContext" | "secret" | "environment">;
 
 export class SecretNode extends vscode.TreeItem {
+  constructor(gitHubRepoContext: GitHubRepoContext, secret: RepoSecret);
+  constructor(gitHubRepoContext: GitHubRepoContext, secret: EnvironmentSecret, environment: Environment);
+  constructor(githubRepoContext: GitHubRepoContext, secret: OrgSecret, environment: undefined, org: true);
   constructor(
     public readonly gitHubRepoContext: GitHubRepoContext,
-    public readonly secret: RepoSecret | EnvironmentSecret,
-    public readonly environment?: Environment
+    public readonly secret: RepoSecret | EnvironmentSecret | OrgSecret,
+    public readonly environment?: Environment,
+    public readonly org?: boolean
   ) {
     super(secret.name);
 
-    this.contextValue = environment ? "env-secret" : "repo-secret";
+    this.contextValue = environment ? "env-secret" : org ? "org-secret" : "repo-secret";
   }
 }

src/treeViews/settings/secretsNode.ts

@@ -1,10 +1,21 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
+import {OrgSecretsNode} from "./orgSecretsNode";
+import {RepoSecretsNode} from "./repoSecretsNode";
+import {SettingsExplorerNode} from "./types";
 
 export class SecretsNode extends vscode.TreeItem {
   constructor(public readonly gitHubRepoContext: GitHubRepoContext) {
     super("Secrets", vscode.TreeItemCollapsibleState.Collapsed);
 
     this.iconPath = new vscode.ThemeIcon("lock");
   }
+
+  get nodes(): SettingsExplorerNode[] {
+    if (this.gitHubRepoContext.organizationOwned) {
+      return [new RepoSecretsNode(this.gitHubRepoContext), new OrgSecretsNode(this.gitHubRepoContext)];
+    }
+
+    return [new RepoSecretsNode(this.gitHubRepoContext)];
+  }
 }

src/treeViews/settings/types.ts

@@ -8,6 +8,10 @@ import {SecretNode} from "./secretNode";
 import {SecretsNode} from "./secretsNode";
 import {SelfHostedRunnersNode} from "./selfHostedRunnersNode";
 import {VariablesNode} from "./variablesNode";
+import {RepoVariablesNode} from "./repoVariablesNode";
+import {OrgVariablesNode} from "./orgVariablesNode";
+import {OrgSecretsNode} from "./orgSecretsNode";
+import {RepoSecretsNode} from "./repoSecretsNode";
 
 export type SettingsExplorerNode =
   | SelfHostedRunnersNode
@@ -16,7 +20,11 @@ export type SettingsExplorerNode =
   | EnvironmentsNode
   | EnvironmentNode
   | EnvironmentSecretsNode
+  | EnvironmentVariablesNode
+  | OrgSecretsNode
+  | OrgVariablesNode
+  | RepoSecretsNode
+  | RepoVariablesNode
   | VariableNode
   | VariablesNode
-  | EnvironmentVariablesNode
   | EmptyNode;

src/treeViews/settings/variableNode.ts

@@ -1,18 +1,22 @@
 import * as vscode from "vscode";
 import {GitHubRepoContext} from "../../git/repository";
-import {Environment, EnvironmentVariable, RepoVariable} from "../../model";
+import {Environment, EnvironmentVariable, OrgVariable, RepoVariable} from "../../model";
 
 export type VariableCommandArgs = Pick<VariableNode, "gitHubRepoContext" | "variable" | "environment">;
 
 export class VariableNode extends vscode.TreeItem {
+  constructor(gitHubRepoContext: GitHubRepoContext, variable: RepoVariable);
+  constructor(gitHubRepoContext: GitHubRepoContext, variable: EnvironmentVariable, environment: Environment);
+  constructor(githubRepoContext: GitHubRepoContext, variable: OrgVariable, environment: undefined, org: true);
   constructor(
     public readonly gitHubRepoContext: GitHubRepoContext,
-    public readonly variable: EnvironmentVariable | RepoVariable,
-    public readonly environment?: Environment
+    public readonly variable: EnvironmentVariable | RepoVariable | OrgVariable,
+    public readonly environment?: Environment,
+    public readonly org?: boolean
   ) {
     super(variable.name);
     this.description = variable.value;
 
-    this.contextValue = environment ? "env-variable" : "repo-variable";
+    this.contextValue = environment ? "env-variable" : org ? "org-variable" : "repo-variable";
   }
 }