Merge branch 'master' into nate.test.relative-paths

CHANGELOG.md

@@ -1,5 +1,10 @@
 # RELEASE NOTES
 
+## [0.6.3] - 2020-04-24
+
+See operational changes at
+[here](https://microsoft.github.io/bedrock-cli/commands/#change_rel_0_6_3).
+
 ## [0.6.2] - 2020-04-12
 
 ### Changed

docs/commands/data.json

@@ -388,6 +388,32 @@
     ],
     "markdown": "## Description\n\nBuilds a scaffold of an infrastructure deployment project containing a\n`definition.yaml` that enables a user to version, modify and organize terraform\ndeployments.\n\nIn detail, it will do the following:\n\n- Create a new folder with the `<name>` you provided.\n- Clone and cache the source repo to `~.spk/templates`.\n- Provide an infrastructure deployment scaffold based on a `<source>` git url\n  for a repo that holds terraform template, a `<version>` respective to the\n  repository tag or branch to pull from, and a `<template>` path to a terraform\n  environment template from the root of the git repo.\n\n## Example\n\n```\nspk infra scaffold --name fabrikam --source https://github.com/microsoft/bedrock --version master --template /cluster/environments/azure-single-keyvault\n```\n\ndefinition.yaml output:\n\n```yaml\nname: fabrikam\nsource: \"https://github.com/microsoft/bedrock.git\"\ntemplate: cluster/environments/azure-single-keyvault\nversion: master\nbackend:\n  storage_account_name: storage-account-name\n  access_key: storage-account-access-key\n  container_name: storage-account-container\n  key: tfstate-key\nvariables:\n  address_space: <insert value>\n  agent_vm_count: <insert value>\n  agent_vm_size: <insert value>\n  cluster_name: <insert value>\n  dns_prefix: <insert value>\n  flux_recreate: <insert value>\n  kubeconfig_recreate: <insert value>\n  gitops_ssh_url: <insert value>\n  gitops_ssh_key: <insert value>\n  gitops_path: <insert value>\n  keyvault_name: <insert value>\n  keyvault_resource_group: <insert value>\n  resource_group_name: <insert value>\n  ssh_public_key: <insert value>\n  service_principal_id: <insert value>\n  service_principal_secret: <insert value>\n  subnet_prefixes: <insert value>\n  vnet_name: <insert value>\n  subnet_name: <insert value>\n  acr_name: <insert value>\n```\n\n**Note:** Definitions will only include variables that do not have a default\nvalue. To override default values, add the variable name to the variables\ndefinition and provide a new value.\n"
   },
+  "project append-variable-group": {
+    "command": "append-variable-group <variable-group-name>",
+    "alias": "avg",
+    "description": "Appends the name of an existing variable group to the current bedrock.yaml file and the associated service build pipelines.",
+    "options": [
+      {
+        "arg": "-o, --org-name <organization-name>",
+        "description": "Organization Name for Azure DevOps",
+        "required": true,
+        "inherit": "azure_devops.org"
+      },
+      {
+        "arg": "-d, --devops-project <devops-project>",
+        "description": "Azure DevOps Project name",
+        "required": true,
+        "inherit": "azure_devops.project"
+      },
+      {
+        "arg": "-a, --personal-access-token <personal-access-token>",
+        "description": "Personal Access Token",
+        "required": true,
+        "inherit": "azure_devops.access_token"
+      }
+    ],
+    "markdown": "## Description\n\nAppend an existing variable group in Azure DevOps project and its services.\n\n## Command Prerequisites\n\nThis command requires to have an existing bedrock project that was initialized\nwith `spk project init`. It also requires that the variable group to be added\nexists in the Azure DevOps project.\n\n## Example\n\nWhen an bedrock project repository is first initialized with `spk project init`,\nit will create a `bedrock.yaml` file that looks similar to this:\n\n```yaml\nrings:\n  master:\n    isDefault: true\nvariableGroups: []\nservices: []\n.\n.\n.\n```\n\nrunning `spk project append-variable-group my-vg` with a variable group name, in\nthis case `my-vg`, will add it under the `variables` section if it does not\nalready exist:\n\n```yaml\nrings:\n  master:\n    isDefault: true\nvariableGroups:\n    - my-vg\nservices: []\n.\n.\n.\n```\n\nIf there are any `services` specified, it will add the variable group to its\ncorresponding `build-update-hld.yaml` file under the `variables` section:\n\n```yaml\nvariables:\n  - group: my-vg\n```\n"
+  },
   "project create-variable-group": {
     "command": "create-variable-group <variable-group-name>",
     "alias": "cvg",
@@ -468,13 +494,13 @@
         "arg": "-a, --personal-access-token <personal-access-token>",
         "description": "Personal Access Token",
         "required": true,
-        "inherit": "azureDevops.access_token"
+        "inherit": "azure_devops.access_token"
       },
       {
         "arg": "-o, --org-name <organization-name>",
         "description": "Organization Name for Azure DevOps",
         "required": true,
-        "inherit": "azureDevops.org"
+        "inherit": "azure_devops.org"
       },
       {
         "arg": "-u, --repo-url <repo-url>",
@@ -485,7 +511,7 @@
         "arg": "-d, --devops-project <devops-project>",
         "description": "Azure DevOps Project name",
         "required": true,
-        "inherit": "azureDevops.project"
+        "inherit": "azure_devops.project"
       },
       {
         "arg": "-b, --build-script-url <build-script-url>",