Merge pull request #326 from microsoft/dev

Dev
microsoft · Feb 18, 2022 · 13df8ba · 13df8ba
2 parents f4388ee + ecc6083
commit 13df8ba
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -71,7 +71,7 @@ jobs:
           az bicep build -f main.bicep --outfile ../../release_assets/azuredeploy.json
 
       - name: Create OpenAPI & Python Client
-        run: bash ./scripts/create-clients.sh ./publish/TeamCloud.API.dll
+        run: bash ./tools/create-clients.sh ./publish/TeamCloud.API.dll
 
       - name: Create Release Asset - Web
         working-directory: ./web
@@ -80,7 +80,7 @@ jobs:
           npm run build
 
       - name: Build CLI
-        run: bash ./scripts/build-cli.sh
+        run: bash ./tools/build-cli.sh
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -131,7 +131,7 @@ jobs:
       # This must be run LAST - AFTER everything is added to release_assets
       - name: Prepare Release Assets
         id: prepare_assets
-        run: python ./scripts/prepare-assets.py ${{ steps.gitversion.outputs.majorMinorPatch }}
+        run: python ./tools/prepare-assets.py ${{ steps.gitversion.outputs.majorMinorPatch }}
 
       - name: Create Release
         id: publish_assets

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -183,7 +183,7 @@
             "label": "ngrok: set url",
             "command": "python3",
             "args": [
-                "scripts/get-url.py"
+                "tools/get-url.py"
             ],
             "problemMatcher": [],
             "presentation": {
@@ -469,7 +469,7 @@
         {
             "label": "create clients",
             "type": "shell",
-            "command": "${workspaceFolder}/scripts/create-clients.sh",
+            "command": "${workspaceFolder}/tools/create-clients.sh",
             "options": {
                 "shell": {
                     "executable": "/bin/sh"

diff --git a/src/TeamCloud.Adapters.AzureResourceManager/AzureResourceManagerAdapter.cs b/src/TeamCloud.Adapters.AzureResourceManager/AzureResourceManagerAdapter.cs
@@ -21,6 +21,7 @@
 using TeamCloud.Secrets;
 using TeamCloud.Serialization;
 using TeamCloud.Serialization.Forms;
+using TeamCloud.Model;
 
 namespace TeamCloud.Adapters.AzureResourceManager;
 
@@ -342,7 +343,7 @@ private async Task<string> CreateResourceIdAsync(Component component)
                 var resourceGroup = await session.ResourceGroups
                     .Define(resourceGroupName)
                         .WithRegion(location)
-                        .WithTag("TeamCloud.ComponentId", component.Id)
+                        .WithTags(component.GetWellKnownTags())
                     .CreateAsync()
                     .ConfigureAwait(false);
 

diff --git a/scripts/build-cli.sh → tools/build-cli.sh b/scripts/build-cli.sh → tools/build-cli.sh
diff --git a/scripts/build-local.sh → tools/build-local.sh b/scripts/build-local.sh → tools/build-local.sh
diff --git a/scripts/bump-version.py → tools/bump-version.py b/scripts/bump-version.py → tools/bump-version.py
diff --git a/scripts/create-clients.cmd → tools/create-clients.cmd b/scripts/create-clients.cmd → tools/create-clients.cmd
diff --git a/scripts/create-clients.sh → tools/create-clients.sh b/scripts/create-clients.sh → tools/create-clients.sh
diff --git a/scripts/delete-task-hubs.sh → tools/delete-task-hubs.sh b/scripts/delete-task-hubs.sh → tools/delete-task-hubs.sh
diff --git a/scripts/get-url.py → tools/get-url.py b/scripts/get-url.py → tools/get-url.py
diff --git a/scripts/prepare-assets.py → tools/prepare-assets.py b/scripts/prepare-assets.py → tools/prepare-assets.py
diff --git a/scripts/test-ci.py → tools/test-ci.py b/scripts/test-ci.py → tools/test-ci.py