Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix java devcontainer on latest feature issue #4405

Merged
merged 6 commits into from
Oct 4, 2024
Merged

fix java devcontainer on latest feature issue #4405

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
428482f
use 1.6 because 1.61 fails to load
vhvb1989 Oct 3, 2024
19984f4
use manual variables
vhvb1989 Oct 3, 2024
1965843
use sub id
vhvb1989 Oct 4, 2024
f481d67
no comment
vhvb1989 Oct 4, 2024
f677227
fix to login az
vhvb1989 Oct 4, 2024
731caa4
back to use comment
vhvb1989 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/dotnet:2": {},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/java:1.6.0": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers/features/python:1": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
Expand Down
26 changes: 13 additions & 13 deletions eng/pipelines/repoman.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ extends:
Write-Host "##vso[task.setvariable variable=CommentBodyFile]$file"
displayName: Set Repoman Content

- task: PowerShell@2
displayName: Post PR comment
inputs:
pwsh: true
targetType: filePath
filePath: ./eng/scripts/Update-PRComment.ps1
arguments: >-
-Repo 'azure/azure-dev'
-PRNumber '$(PRNumber)'
-BodyFile '$(CommentBodyFile)'
-Tag '<!-- #comment-repoman-generate -->'
env:
GH_TOKEN: $(azuresdk-github-pat)
# - task: PowerShell@2
vhvb1989 marked this conversation as resolved.
Show resolved Hide resolved
# displayName: Post PR comment
# inputs:
# pwsh: true
# targetType: filePath
# filePath: ./eng/scripts/Update-PRComment.ps1
# arguments: >-
# -Repo 'azure/azure-dev'
# -PRNumber '$(PRNumber)'
# -BodyFile '$(CommentBodyFile)'
# -Tag '<!-- #comment-repoman-generate -->'
# env:
# GH_TOKEN: $(azuresdk-github-pat)

- template: /eng/pipelines/templates/jobs/run-template-tests.yml
parameters:
Expand Down
26 changes: 13 additions & 13 deletions eng/pipelines/templates/steps/template-test-run-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ steps:
env: |
# Required secrets for Terraform service principal authentication
# $(arm-*) secrets are set by azd-login.yml
ARM_CLIENT_ID=$(arm-client-id)
ARM_CLIENT_SECRET=$(arm-client-secret)
ARM_TENANT_ID=$(arm-tenant-id)
SUBSCRIPTION_ID=$(SubscriptionId)
ARM_CLIENT_ID=$(arm-client-id-test-tenant)
ARM_CLIENT_SECRET=$(arm-client-secret-test-tenant)
ARM_TENANT_ID=$(arm-tenant-id-test-tenant)
SUBSCRIPTION_ID=$(SubscriptionId-test-tenant)
vhvb1989 marked this conversation as resolved.
Show resolved Hide resolved

# Pass in TemplateRunEnvironmentVariables
$(VARIABLE_LIST)
Expand All @@ -86,7 +86,7 @@ steps:
VALIDATE=$(TemplateName)
PLAYWRIGHT_REPORTER='list'
LOCATION=$(AzureLocation)
SUBSCRIPTION=$(SubscriptionId)
SUBSCRIPTION=$(SubscriptionId-test-tenant)
ENV_SUFFIX=$(Build.BuildId)-$(System.JobAttempt)
CLEANUP=$(SynchronousCleanup)

Expand Down Expand Up @@ -114,19 +114,19 @@ steps:

# Login azd
azd auth login \
--client-id "$(arm-client-id)" \
--client-secret "$(arm-client-secret)" \
--tenant-id "$(arm-tenant-id)"
--client-id "$(arm-client-id-test-tenant)" \
--client-secret "$(arm-client-secret-test-tenant)" \
--tenant-id "$(arm-tenant-id-test-tenant)"

# Login az CLI (required for scenarios where az is invoked)
az login \
--service-principal \
-u "$(arm-client-id)" \
-p "$(arm-client-secret)" \
--tenant "$(arm-tenant-id)"
-u "$(arm-client-id-test-tenant)" \
-p="$(arm-client-secret-test-tenant)" \
--tenant "$(arm-tenant-id-test-tenant)"

# set default sub for az to be the same used by azd
az account set --subscription "$(SubscriptionId)"
az account set --subscription "$(SubscriptionId-test-tenant)"

# enable alpha features
azd config set alpha.all on
Expand All @@ -143,7 +143,7 @@ steps:
-e '$(EnvPrefixName)' \
-t '$(TemplateName)' \
-b '$(TemplateBranchName)' \
-s '$(SubscriptionId)' \
-s '$(SubscriptionId-test-tenant)' \
-u '$(Build.BuildId)-$(System.JobAttempt)' \
-l '$(AzureLocation)' \
-p 'list' \
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/java/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/java:1.6.0": {},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"ghcr.io/devcontainers/features/terraform:1": {
"version": "latest"
},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/java:1.6.0": {},
"ghcr.io/azure/azure-dev/azd:latest": {}
},
"customizations": {
Expand Down