repo owner from args

kshitijzutshi222 · Jun 8, 2023 · 19dfe90 · 19dfe90
1 parent 3f4783c
commit 19dfe90
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/action.yml b/action.yml
@@ -27,6 +27,10 @@ inputs:
     description: 'Sync secrets to dependabot (yes/no), default yes'
     mandatory: False
     default: 'no'
+  repo_owner:
+    description: 'Repository Owner Name'
+    mandatory: False
+    default: 'philips-internal'
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -38,6 +42,7 @@ runs:
     VALUES: ${{ inputs.secret-values }}
     REPO: ${{ inputs.repo }}
     DEPENDABOTSECRETSYNC: ${{ inputs.dependabotSecretsSync}}
+    REPOSITORYOWNER: ${{ github.repository_owner }}
 branding:
   icon: 'lock'  
   color: 'blue'
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -2,13 +2,13 @@
 
 if [ ${#TEAM} -gt 0 ] && [ ${#REPO} -gt 0 ]
 then
-  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --team $TEAM --repo $REPO --dependabotsecretssync $DEPENDABOTSECRETSYNC
+  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --team $TEAM --repo $REPO --dependabotsecretssync $DEPENDABOTSECRETSYNC --repoowner $REPOSITORYOWNER 
 elif [ ${#TEAM} -gt 0 ]
 then
-  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --team $TEAM --dependabotsecretssync $DEPENDABOTSECRETSYNC
+  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --team $TEAM --dependabotsecretssync $DEPENDABOTSECRETSYNC --repoowner $REPOSITORYOWNER
 elif [ ${#REPO} -gt 0 ]
 then
-  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --repo $REPO --dependabotsecretssync $DEPENDABOTSECRETSYNC
+  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --repo $REPO --dependabotsecretssync $DEPENDABOTSECRETSYNC --repoowner $REPOSITORYOWNER
 else
-  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --dependabotsecretssync $DEPENDABOTSECRETSYNC
+  python /app/main.py $ACTION --token $TOKEN --names $NAMES --values $VALUES --dependabotsecretssync $DEPENDABOTSECRETSYNC --repoowner $REPOSITORYOWNER
 fi
diff --git a/main.py b/main.py
@@ -19,6 +19,7 @@
 teamCommand = "--team"
 repoCommand = "--repo"
 dependabotSecretsSyncOption = "--dependabotsecretssync"
+repoOwner = "--repoowner"
 interactiveCommand = "--interactive"
 
 noTokenMessage = "Please provide a valid GitHub PAT using --token <PAT>."
@@ -127,9 +128,10 @@ def get_input_from_cli():
     target_team_name = get_optional_value_from_input(args, teamCommand)
     target_repo_name = get_optional_value_from_input(args, repoCommand)
     dependabotSecretsSync = get_optional_value_from_input(args, dependabotSecretsSyncOption)
+    repoOwner = get_optional_value_from_input(args, repoOwner)
     interactive = interactiveCommand in args
     action = validate_action(args[0], createCommand, updateCommand, deleteCommand, secret_names, secret_values)
-    return UserInput(token, action, secret_names, secret_values, target_team_name, target_repo_name, dependabotSecretsSync, interactive)
+    return UserInput(token, action, secret_names, secret_values, target_team_name, target_repo_name, dependabotSecretsSync, repoOwner, interactive)
 
 
 def flatten_secrets_dict(dict_of_secrets):
@@ -171,9 +173,9 @@ def add_secret(token, target_repository, secret_name, secret_value):
     else:
         print(f"Secret \"{secret_name}\" already exists in {repo_name}")
 
-def add_dependabot_secret(token, target_repository, secret_name, secret_value):
+def add_dependabot_secret(token, target_repository, secret_name, secret_value, repoOwner):
     repo_name = target_repository.name
-    repo_owner = "philips-internal"
+    repo_owner = repoOwner
     key_id, key = get_repo_public_key(token, repo_owner, repo_name)
     query_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/dependabot/secrets"
     headers = {'Authorization': f'token {token}'}
@@ -200,9 +202,9 @@ def add_dependabot_secret(token, target_repository, secret_name, secret_value):
     else:
         print(f"dependabot Secret \"{secret_name}\" already exists in {repo_name}")
 
-def update_dependabot_secret(token, target_repository, secret_name, secret_value):
+def update_dependabot_secret(token, target_repository, secret_name, secret_value, repoOwner):
     repo_name = target_repository.name
-    repo_owner = "philips-internal"
+    repo_owner = repoOwner
     key_id, key = get_repo_public_key(token, repo_owner, repo_name)
     query_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/dependabot/secrets"
     headers = {'Authorization': f'token {token}'}
@@ -227,9 +229,9 @@ def update_dependabot_secret(token, target_repository, secret_name, secret_value
         else:
             print(f"dependabot Secret \"{secret_name}\" could NOT be updated in {repo_name}")
 
-def delete_dependabot_secret(token, target_repository, secret_name):
+def delete_dependabot_secret(token, target_repository, secret_name, repoOwner):
     repo_name = target_repository.name
-    repo_owner = "philips-internal"
+    repo_owner = repoOwner
     headers = {'Authorization': f'token {token}'}
     # put call add repo secrets to dependabot secrets
     url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/dependabot/secrets/{secret_name}"
@@ -267,16 +269,16 @@ def delete_dependabot_secret(token, target_repository, secret_name):
                     try:
                         if inp.action == createCommand:
                             add_secret(inp.token, repo, inp.secret_names[i], inp.secret_values[i])
-                            add_dependabot_secret(inp.token, repo, inp.secret_names[i], inp.secret_values[i])
+                            add_dependabot_secret(inp.token, repo, inp.secret_names[i], inp.secret_values[i], inp.repoOwner)
                         if inp.action == updateCommand:
                             c = repo.get_contributors()
                             repo.create_secret(inp.secret_names[i], inp.secret_values[i])
                             print(f"Secret \"{inp.secret_names[i]}\" updated for {repo.name}")
-                            update_dependabot_secret(inp.token, repo, inp.secret_names[i], inp.secret_values[i])
+                            update_dependabot_secret(inp.token, repo, inp.secret_names[i], inp.secret_values[i], inp.repoOwner)
                         if inp.action == deleteCommand:
                             repo.delete_secret(inp.secret_names[i])
                             print(f"Secret \"{inp.secret_names[i]}\" removed from {repo.name}")
-                            delete_dependabot_secret(inp.token, repo, inp.secret_names[i])
+                            delete_dependabot_secret(inp.token, repo, inp.secret_names[i], inp.repoOwner)
                     except UnknownObjectException:
                         print(f"The provided token does not have permission to manage {repo.name}, it is being skipped")
             else: