Address issue where no action was taken if no repos filter was specified

rewindio · Aug 25, 2020 · a7a88b3 · a7a88b3
1 parent 0d7a195
commit a7a88b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## [1.2.1]
+
+- Fix lack of processing when no --repos flag is specified
+
 ## [1.2.0]
 
 - Support for --repos flag for selective application of secrets

diff --git a/github-secrets-manager.py b/github-secrets-manager.py
@@ -202,7 +202,25 @@ def remove_secret(repo_path, secret_name, github_handle):
             for repo in repos:
                 repo = repo.strip()
 
-                if len(repos_filter) > 0 and repo in repos_filter:
+                if len(repos_filter) > 0:
+                    if repo in repos_filter:
+                        if remove:
+                            if dryrun:
+                                logging.info("DRYRUN: Removing %s from %s" % (secret_name, repo))
+                            else:
+                                if remove_secret(repo, secret_name, github_handle):
+                                    logging.info("Successfully removed secret %s from %s" % (secret_name, repo))
+                                else:
+                                    logging.error("Unable to remove secret %s from %s" % (secret_name, repo))
+                        else:
+                            if dryrun:
+                                logging.info("DRYRUN: Adding %s to %s" % (secret_name, repo))
+                            else:
+                                if upsert_secret(repo, secret_name, secret_val, github_handle):
+                                    logging.info("Successfully added/updated secret %s in repo %s" % (secret_name, repo))
+                                else:
+                                    logging.error("Unable to add/update secret %s in repo %s" % (secret_name, repo))
+                else:
                     if remove:
                         if dryrun:
                             logging.info("DRYRUN: Removing %s from %s" % (secret_name, repo))

diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@ def get_install_requirements(path):
 
 setup(
     name=NAME,
-    version="1.2.0",
+    version="1.2.1",
     description="Manage github repo secrets using a common configuration file",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",