Merge branch 'main' into fix/asr-replicated-vm-disk-update-in-place

Author: ziyeqf

.github/labeler-issue-triage.yml

@@ -249,11 +249,14 @@ service/network-function:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(network_function_azure_traffic_collector\W+|network_function_collector_policy\W+|new_relic_monitor\W+|new_relic_tag_rule\W+)((.|\n)*)###'
 
 service/nginx:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(nginx_|oracle_)((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_nginx_((.|\n)*)###'
 
 service/notifications:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_notification_hub((.|\n)*)###'
 
+service/oracle:
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_oracle_((.|\n)*)###'
+
 service/orbital:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_orbital_((.|\n)*)###'
 

.github/labeler-pull-request-triage.yml

@@ -424,6 +424,11 @@ service/notifications:
   - any-glob-to-any-file:
     - internal/services/notificationhub/**/*
 
+service/oracle:
+- changed-files:
+  - any-glob-to-any-file:
+    - internal/services/oracle/**/*
+
 service/orbital:
 - changed-files:
   - any-glob-to-any-file:

.github/workflows/comment-ci-failure-outdated.yaml

@@ -11,19 +11,22 @@ jobs:
   comment-ci-failure-outdated:
     runs-on: ubuntu-latest
     steps:
-      - name: Minimize outdated failure comments
+      - name: Strike through fixed failure and clean up
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           result-encoding: string
+          retries: 3
           script: |
             const workflowName = '${{ github.workflow }}';
+            const sha = '${{ github.event.pull_request.head.sha }}';
+            const shortSha = sha.substring(0, 7);
             const prNumber = ${{ github.event.number }};
-            const marker = `<b>Build failure: ${workflowName}</b>`;
 
-            console.log(`==> Checking PR #${prNumber} for outdated "${workflowName}" failure comments...`);
-            console.log(`    Marker: ${marker}`);
+            console.log(`=== Comment Cleanup: "${workflowName}" ===`);
+            console.log(`PR #${prNumber}, commit ${shortSha} (${sha})`);
 
-            // Use GraphQL to fetch comments with isMinimized status, paginating through all
+            // Fetch all comments using GraphQL for minimize capability
+            console.log(`Fetching PR comments via GraphQL...`);
             const query = `
               query($owner: String!, $repo: String!, $number: Int!, $cursor: String) {
                 repository(owner: $owner, name: $repo) {
@@ -46,15 +49,15 @@ jobs:
               }
             `;
 
+            // Collect all non-minimized failure comments
             let cursor = null;
             let hasNextPage = true;
-            let totalComments = 0;
-            let botComments = 0;
-            let matchingComments = 0;
-            let minimizedCount = 0;
-            let alreadyHiddenCount = 0;
+            const failureComments = [];
+            let totalFetched = 0;
+            let pageCount = 0;
 
             while (hasNextPage) {
+              pageCount++;
               const result = await github.graphql(query, {
                 owner: context.repo.owner,
                 repo: context.repo.repo,
@@ -65,43 +68,104 @@ jobs:
               const { nodes, pageInfo } = result.repository.pullRequest.comments;
               hasNextPage = pageInfo.hasNextPage;
               cursor = pageInfo.endCursor;
-              totalComments += nodes.length;
+              totalFetched += nodes.length;
 
               for (const comment of nodes) {
-                // Only target comments left by the github-actions bot.
                 // GraphQL returns author.login as 'github-actions' while the REST API
                 // returns it as 'github-actions[bot]'. Using startsWith to handle both.
                 if (!comment.author.login.startsWith('github-actions')) continue;
-                botComments++;
+                if (!comment.body) continue;
+                if (comment.isMinimized) continue;
 
-                if (!comment.body || !comment.body.includes(marker)) continue;
-                matchingComments++;
+                if (comment.body.includes('CI Build Failures for')) {
+                  failureComments.push(comment);
+                }
+              }
+            }
+
+            console.log(`Fetched ${totalFetched} comments across ${pageCount} page(s)`);
+            console.log(`Found ${failureComments.length} active (non-minimized) failure comment(s)`);
+
+            // Process ALL non-minimized failure comments for this workflow
+            let struckCount = 0;
+            for (const comment of failureComments) {
+              const hasActiveLine = comment.body.split('\n').some(line =>
+                line.trim().startsWith('- ❌') &&
+                line.includes(`<b>${workflowName}</b>`) &&
+                !line.includes('<del>')
+              );
+              if (!hasActiveLine) continue;
 
-                // Skip comments that are already minimized
-                if (comment.isMinimized) {
-                  alreadyHiddenCount++;
-                  const url = `https://github.com/${context.repo.owner}/${context.repo.repo}/pull/${prNumber}#issuecomment-${comment.databaseId}`;
-                  console.log(`    Already hidden: ${url}`);
-                  continue;
+              console.log(`\n--- Processing comment (id: ${comment.databaseId}) ---`);
+
+              // Strike through the line for this workflow
+              const lines = comment.body.split('\n');
+              const updatedLines = lines.map(line => {
+                if (line.trim().startsWith('- ❌') &&
+                    line.includes(`<b>${workflowName}</b>`) &&
+                    !line.includes('<del>')) {
+                  console.log(`Striking through: ${line.trim().substring(0, 60)}...`);
+                  return `- <del>${line.trim().substring(2)}</del>`;
                 }
+                return line;
+              });
+
+              // Count remaining active failures in this comment
+              const activeFailures = updatedLines.filter(l =>
+                l.trim().startsWith('- ❌') && !l.includes('<del>')
+              ).length;
+              const totalFailures = updatedLines.filter(l =>
+                l.trim().startsWith('- ❌') || l.trim().startsWith('- <del>')
+              ).length;
 
+              console.log(`Failure count: ${activeFailures} active / ${totalFailures} total`);
+
+              // Update counter line
+              let body;
+              if (activeFailures === 0) {
+                console.log(`All failures resolved in this comment — updating counter to "All jobs have been fixed!"`);
+                body = updatedLines.join('\n').replace(
+                  /^(?:\d+(?:\/\d+)?\s+job.*:|All jobs have been fixed.*$)/m,
+                  `All jobs have been fixed! ✅`
+                );
+              } else {
+                const counterText = `${activeFailures}/${totalFailures} jobs still failing:`;
+                console.log(`Updating counter to "${counterText}"`);
+                body = updatedLines.join('\n').replace(
+                  /^(?:\d+(?:\/\d+)?\s+job.*:|All jobs have been fixed.*$)/m,
+                  counterText
+                );
+              }
+
+              // Update the comment
+              await github.rest.issues.updateComment({
+                comment_id: comment.databaseId,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: body,
+              });
+              struckCount++;
+              console.log(`✅ Struck through "${workflowName}" in comment (id: ${comment.databaseId})`);
+
+              // If all failures in this comment are resolved, minimize it
+              if (activeFailures === 0) {
+                console.log(`All failures resolved — minimizing comment (id: ${comment.databaseId})...`);
                 await github.graphql(`
                   mutation($id: ID!) {
                     minimizeComment(input: {
                       subjectId: $id,
-                      classifier: OUTDATED
+                      classifier: RESOLVED
                     }) {
-                      minimizedComment {
-                        isMinimized
-                      }
+                      minimizedComment { isMinimized }
                     }
                   }
                 `, { id: comment.id });
-
-                minimizedCount++;
-                const url = `https://github.com/${context.repo.owner}/${context.repo.repo}/pull/${prNumber}#issuecomment-${comment.databaseId}`;
-                console.log(`    Minimized: ${url}`);
+                console.log(`✅ Minimized resolved comment (id: ${comment.databaseId})`);
               }
             }
 
-            console.log(`==> Done. Scanned ${totalComments} comments: ${botComments} from bot, ${matchingComments} matching "${workflowName}", ${minimizedCount} newly minimized, ${alreadyHiddenCount} already hidden.`);
+            if (struckCount === 0) {
+              console.log(`✅ No active failure line found for "${workflowName}" in any comment — nothing to strike through`);
+            } else {
+              console.log(`\n✅ Done — struck through "${workflowName}" in ${struckCount} comment(s)`);
+            }

.github/workflows/comment-ci-failure.yaml

@@ -14,12 +14,21 @@ jobs:
       - name: Get run url
         run: |
           echo "gha_url=https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" >> $GITHUB_ENV
-      - name: Send build failure comment
+      - name: Add failure to unified build comment
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           result-encoding: string
+          retries: 3
           script: |
             const workflowName = '${{ github.workflow }}';
+            const sha = '${{ github.event.pull_request.head.sha }}';
+            const shortSha = sha.substring(0, 7);
+            const runUrl = '${{ env.gha_url }}';
+            const prNumber = ${{ github.event.number }};
+
+            console.log(`=== Comment Failure: "${workflowName}" ===`);
+            console.log(`PR #${prNumber}, commit ${shortSha} (${sha})`);
+            console.log(`Run URL: ${runUrl}`);
 
             const guidance = {
               'Vendor Dependencies Check': 'Do not modify files in the `vendor/` directory directly. Instead, update dependencies in `go.mod` and run `go mod vendor` to sync the vendor directory. Then run `make depscheck` locally to verify.',
@@ -30,20 +39,129 @@ jobs:
               'Unit Tests': 'Run `make test` locally to reproduce and fix the failing unit tests.',
               'ShellCheck Scripts': 'Run `make shellcheck` locally to check shell scripts for issues and fix any warnings or errors.',
               'Validate Examples': 'Run `make validate-examples` locally to check that your example Terraform configurations under `examples/` are valid.',
-
+              'Provider Tests': 'Run `make testacc TEST=./internal/provider TESTARGS="-run \'^TestAcc\'"` locally to reproduce and fix the failing provider tests.',
+              'Check for new usages of deprecated functionality': 'Your changes introduce new usages of deprecated functions or patterns. Please use the recommended replacements instead.',
+              'Preview ARM API Version Linter': 'Your changes reference Azure ARM API versions that are in preview. Please update the API version references to use GA (stable) versions.',
             };
 
-            let body = `<b>Build failure: ${workflowName}</b>\n\nThis pull request contains a build failure in the <b>${workflowName}</b> check which needs to be addressed [here](${{ env.gha_url }}).`;
+            const commitUrl = `https://github.com/${{ github.repository }}/commit/${sha}`;
+            const marker = `CI Build Failures for <a href="${commitUrl}"><code>${shortSha}</code></a>`;
+            const guideText = guidance[workflowName] || 'Check the logs for details on the failure.';
+            const failureLine = `- ❌ <b>${workflowName}</b> — ${guideText} (<a href="${runUrl}">logs</a>)`;
 
-            if (guidance[workflowName]) {
-              body += `\n\n<b>How to fix:</b> ${guidance[workflowName]}`;
+            if (!guidance[workflowName]) {
+              console.log(`⚠️  No guidance text found for workflow "${workflowName}", using default`);
             }
 
-            body += `\n\nFor more information, please refer to our [Contributing Guide](https://github.com/${{ github.repository }}/blob/main/contributing/README.md).`;
+            const footer = `\n\nFor more information, please refer to our <a href="https://github.com/${{ github.repository }}/blob/main/contributing/README.md">Contributing Guide</a>.`;
 
-            github.rest.issues.createComment({
-              issue_number: ${{ github.event.number }},
+            // Find existing unified comment for this commit
+            console.log(`Searching for existing unified comment with marker: "${marker}"`);
+            const { data: comments } = await github.rest.issues.listComments({
+              issue_number: prNumber,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: body
-            })
+              per_page: 100,
+            });
+
+            const botComments = comments.filter(c => c.user.login === 'github-actions[bot]');
+            console.log(`Found ${comments.length} total comments, ${botComments.length} from github-actions[bot]`);
+
+            const botComment = botComments.find(c => c.body && c.body.includes('CI Build Failures for') && c.body.includes(`<code>${shortSha}</code>`));
+
+            if (botComment) {
+              console.log(`Found existing unified comment (id: ${botComment.id}) for commit ${shortSha}`);
+
+              let body = botComment.body;
+
+              const activeLinePattern = `- ❌ <b>${workflowName}</b>`;
+              const struckLinePattern = `- <del>❌ <b>${workflowName}</b>`;
+
+              if (body.includes(struckLinePattern)) {
+                console.log(`"${workflowName}" was previously struck through (fixed) — removing old line and re-adding as active failure`);
+                const lines = body.split('\n');
+                const filtered = lines.filter(line => {
+                  const trimmed = line.trim();
+                  return !(trimmed.startsWith('- <del>') && trimmed.includes(`<b>${workflowName}</b>`));
+                });
+                body = filtered.join('\n');
+                // Fall through to insert the new failure line below
+              } else if (body.includes(activeLinePattern)) {
+                console.log(`"${workflowName}" already has an active failure line — updating log URL`);
+                const lines = body.split('\n');
+                const updated = lines.map(line => {
+                  if (line.includes(`<b>${workflowName}</b>`) && !line.includes('<del>')) {
+                    return failureLine;
+                  }
+                  return line;
+                });
+                body = updated.join('\n');
+
+                body = updateCounter(body);
+
+                await github.rest.issues.updateComment({
+                  comment_id: botComment.id,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body: body,
+                });
+                console.log(`✅ Updated log URL for "${workflowName}" in unified comment`);
+                return;
+              } else {
+                console.log(`"${workflowName}" is a new failure — adding to existing comment`);
+              }
+
+              // Insert the new failure line before the footer
+              const footerIndex = body.lastIndexOf('\n\nFor more information');
+              if (footerIndex !== -1) {
+                body = body.substring(0, footerIndex) + '\n' + failureLine + body.substring(footerIndex);
+                console.log(`Inserted failure line before footer`);
+              } else {
+                body += '\n' + failureLine;
+                console.log(`⚠️  Footer not found, appended failure line to end`);
+              }
+
+              body = updateCounter(body);
+
+              await github.rest.issues.updateComment({
+                comment_id: botComment.id,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: body,
+              });
+              console.log(`✅ Added "${workflowName}" failure to existing unified comment (id: ${botComment.id})`);
+            } else {
+              console.log(`No existing unified comment found for commit ${shortSha} — creating new one`);
+
+              const body = `<b>${marker}</b>\n\n` +
+                `1 job has failed and needs to be addressed:\n\n` +
+                failureLine +
+                footer;
+
+              const { data: newComment } = await github.rest.issues.createComment({
+                issue_number: prNumber,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: body,
+              });
+              console.log(`✅ Created unified failure comment (id: ${newComment.id}) for "${workflowName}" at commit ${shortSha}`);
+            }
+
+            function updateCounter(body) {
+              const lines = body.split('\n');
+              const activeFailures = lines.filter(l =>
+                l.trim().startsWith('- ❌') && !l.includes('<del>')
+              ).length;
+              const totalFailures = lines.filter(l =>
+                (l.trim().startsWith('- ❌') || (l.trim().startsWith('- <del>')))
+              ).length;
+
+              const counterText = activeFailures === totalFailures
+                ? `${activeFailures} job${activeFailures === 1 ? ' has' : 's have'} failed and need${activeFailures === 1 ? 's' : ''} to be addressed:`
+                : `${activeFailures}/${totalFailures} jobs still failing:`;
+
+              console.log(`Counter update: ${activeFailures} active / ${totalFailures} total → "${counterText}"`);
+
+              // Replace the counter line
+              return body.replace(/^(?:\d+(?:\/\d+)?\s+job.*:|All jobs have been fixed.*$)/m, counterText);
+            }