From 072c7a52061a367ac13d983084c8b67e9c865451 Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Mon, 9 Sep 2019 16:52:55 -0700 Subject: [PATCH 1/4] Update realtimeserving-release.yml for Azure Pipelines --- .ci/realtimeserving-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/realtimeserving-release.yml b/.ci/realtimeserving-release.yml index 7b61b5d..5d91fc0 100644 --- a/.ci/realtimeserving-release.yml +++ b/.ci/realtimeserving-release.yml @@ -3,6 +3,8 @@ # Add steps that build, run tests, deploy, and more: # https://aka.ms/yaml +trigger: + batch: true stages: - stage: dev From 6a992ea4e7f8d115c93d4f5e95d4e5021432262e Mon Sep 17 00:00:00 2001 From: Daniel Ciborowski Date: Mon, 9 Sep 2019 23:42:24 -0700 Subject: [PATCH 2/4] Update realtimeserving-release.yml for Azure Pipelines --- .ci/realtimeserving-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/realtimeserving-release.yml b/.ci/realtimeserving-release.yml index 5d91fc0..8a313c2 100644 --- a/.ci/realtimeserving-release.yml +++ b/.ci/realtimeserving-release.yml @@ -72,4 +72,4 @@ stages: project: "e2etestharness" expires : "DnD" alias: $(Build.RequestedForId) - agent: $(agent) + agent: AI-GPU From 58b3e210c65e4e8d2aa6ffeaccf02a9033fb6ff5 Mon Sep 17 00:00:00 2001 From: Steven Schneider Date: Tue, 10 Sep 2019 17:11:31 -0700 Subject: [PATCH 3/4] script that will be used to capture storage connection string. --- .ci/scripts/set_secret.py | 25 +++++++++++++++++++++++++ .ci/scripts/syntax.txt | 5 +++++ 2 files changed, 30 insertions(+) create mode 100644 .ci/scripts/set_secret.py create mode 100644 .ci/scripts/syntax.txt diff --git a/.ci/scripts/set_secret.py b/.ci/scripts/set_secret.py new file mode 100644 index 0000000..24aaae5 --- /dev/null +++ b/.ci/scripts/set_secret.py @@ -0,0 +1,25 @@ +#!/usr/bin/python3 + +import argparse +from azure.keyvault import KeyVaultClient +from azure.common.client_factory import get_client_from_cli_profile + + +def set_secret(kv_endpoint, secret_name, secret_value): + client = get_client_from_cli_profile(KeyVaultClient) + client.set_secret(kv_endpoint, secret_name, secret_value) + + +if __name__ == "__main__": + # hard coded for now + kv_endpoint = "https://t3scriptkeyvault.vault.azure.net/" + parser = argparse.ArgumentParser() + + parser.add_argument('-n', '--secretName', required=True, + help="The name of the secret") + parser.add_argument('-v', '--secretValue', required=True, + help="The value of the secret") + + args = parser.parse_args() + + set_secret(kv_endpoint, args.secretName, args.secretValue) diff --git a/.ci/scripts/syntax.txt b/.ci/scripts/syntax.txt new file mode 100644 index 0000000..cb432da --- /dev/null +++ b/.ci/scripts/syntax.txt @@ -0,0 +1,5 @@ +{ENVIRONMENT_PREFIX} is what we discussed earlier in regards to adding a new parameter. +This will give us a way to easily identify the appropriate connection string to reference late in our steps. + + +set_secret.py -n "{ENVIRONMENT_PREFIX}-key" -v "{STORAGE_CONNECTIONSTRING}" \ No newline at end of file From 6c23f980ac627c1a85f13c2bcbffb20cd5037328 Mon Sep 17 00:00:00 2001 From: Steven Schneider Date: Tue, 10 Sep 2019 19:35:30 -0700 Subject: [PATCH 4/4] cleaning up entrypoint and printing out status of adding secret to keyvault --- .ci/scripts/set_secret.py | 25 +++++++++++++++++++------ .ci/scripts/syntax.txt | 5 ----- 2 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 .ci/scripts/syntax.txt diff --git a/.ci/scripts/set_secret.py b/.ci/scripts/set_secret.py index 24aaae5..4d60fe9 100644 --- a/.ci/scripts/set_secret.py +++ b/.ci/scripts/set_secret.py @@ -7,12 +7,17 @@ def set_secret(kv_endpoint, secret_name, secret_value): client = get_client_from_cli_profile(KeyVaultClient) - client.set_secret(kv_endpoint, secret_name, secret_value) + try: + client.set_secret(kv_endpoint, secret_name, secret_value) + return "Successfully created secret: {secret_name} in keyvault: {kv_endpoint}".format( + secret_name=secret_name, kv_endpoint=kv_endpoint) + except Exception as ex: + return "Failed to create secret: {secret_name} in keyvault: {kv_endpoint}".format( + secret_name=secret_name, kv_endpoint=kv_endpoint) -if __name__ == "__main__": - # hard coded for now - kv_endpoint = "https://t3scriptkeyvault.vault.azure.net/" + +def parse_args(): parser = argparse.ArgumentParser() parser.add_argument('-n', '--secretName', required=True, @@ -20,6 +25,14 @@ def set_secret(kv_endpoint, secret_name, secret_value): parser.add_argument('-v', '--secretValue', required=True, help="The value of the secret") - args = parser.parse_args() + return parser.parse_args() + + +if __name__ == "__main__": + # hard coded for now + kv_endpoint = "https://t3scriptkeyvault.vault.azure.net/" + args = parse_args() + message = set_secret( + kv_endpoint, args.secretName, args.secretValue) - set_secret(kv_endpoint, args.secretName, args.secretValue) + print(message) diff --git a/.ci/scripts/syntax.txt b/.ci/scripts/syntax.txt deleted file mode 100644 index cb432da..0000000 --- a/.ci/scripts/syntax.txt +++ /dev/null @@ -1,5 +0,0 @@ -{ENVIRONMENT_PREFIX} is what we discussed earlier in regards to adding a new parameter. -This will give us a way to easily identify the appropriate connection string to reference late in our steps. - - -set_secret.py -n "{ENVIRONMENT_PREFIX}-key" -v "{STORAGE_CONNECTIONSTRING}" \ No newline at end of file