From 0398ea25d3c08685f3c3f33aba32c5f1b4bfdec3 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Wed, 1 Dec 2021 10:20:38 -0700
Subject: [PATCH] Clean up scaffolder config

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/cool-rules-smash.md         |  5 +++++
 app-config.yaml                        | 18 ------------------
 plugins/scaffolder-backend/config.d.ts | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/cool-rules-smash.md

diff --git a/.changeset/cool-rules-smash.md b/.changeset/cool-rules-smash.md
new file mode 100644
index 0000000000..d879dc5f5b
--- /dev/null
+++ b/.changeset/cool-rules-smash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Removed unused scaffolder visibility configuration; this has been moved to publish actions. Deprecated scaffolder provider configuration keys; these should use the integrations configuration instead.
diff --git a/app-config.yaml b/app-config.yaml
index 913a72dbab..4adaea0da4 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -277,24 +277,6 @@ scaffolder:
   #   email: scaffolder@backstage.io
   # Use to customize the default commit message when new components are created
   # defaultCommitMessage: 'Initial commit'
-  github:
-    token: ${GITHUB_TOKEN}
-    visibility: public # or 'internal' or 'private'
-  gitlab:
-    api:
-      baseUrl: https://gitlab.com
-      token: ${GITLAB_TOKEN}
-    visibility: public # or 'internal' or 'private'
-  azure:
-    baseUrl: https://dev.azure.com/{your-organization}
-    api:
-      token: ${AZURE_TOKEN}
-  bitbucket:
-    api:
-      host: https://bitbucket.org
-      username: ${BITBUCKET_USERNAME}
-      token: ${BITBUCKET_TOKEN}
-    visibility: public # or or 'private'
 
 auth:
   ### Add auth.keyStore.provider to more granularly control how to store JWK data when running
diff --git a/plugins/scaffolder-backend/config.d.ts b/plugins/scaffolder-backend/config.d.ts
index 126c55e166..aa4ecf8053 100644
--- a/plugins/scaffolder-backend/config.d.ts
+++ b/plugins/scaffolder-backend/config.d.ts
@@ -28,30 +28,30 @@ export interface Config {
      * The commit message used when new components are created.
      */
     defaultCommitMessage?: string;
+    /**
+     * @deprecated Replaced by parameters for the publish:github action
+     */
     github?: {
       [key: string]: string;
-      /**
-       * The visibility to set on created repositories.
-       */
-      visibility?: 'public' | 'internal' | 'private';
     };
+    /**
+     * @deprecated Use the Gitlab integration instead
+     */
     gitlab?: {
       api: { [key: string]: string };
-      /**
-       * The visibility to set on created repositories.
-       */
-      visibility?: 'public' | 'internal' | 'private';
     };
+    /**
+     * @deprecated Use the Azure integration instead
+     */
     azure?: {
       baseUrl: string;
       api: { [key: string]: string };
     };
+    /**
+     * @deprecated Use the Bitbucket integration instead
+     */
     bitbucket?: {
       api: { [key: string]: string };
-      /**
-       * The visibility to set on created repositories.
-       */
-      visibility?: 'public' | 'private';
     };
   };
 }