Skip to content

Commit

Permalink
Merge branch 'main' into adsandor/tldefault
Browse files Browse the repository at this point in the history
  • Loading branch information
Sandido authored Nov 5, 2023
2 parents 0f0beef + fdfe972 commit 3240ca9
Show file tree
Hide file tree
Showing 12,952 changed files with 1,650,458 additions and 677,660 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
File renamed without changes.
5 changes: 3 additions & 2 deletions .azure-pipelines/sync-aliases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
inputs:
packageType: sdk
version: 7.0.x
- template: util/get-github-pat-steps.yml

- pwsh: |
dotnet --version
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
git add .github/policies
git commit -m "Sync resourceManagement.yml"
git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git;
git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git;
git push origin internal/sync-resourcemanagement-yml --force
displayName: Git commit and push
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
Expand All @@ -67,6 +68,6 @@ jobs:
$HeadBranch = "internal/sync-resourcemanagement-yml"
$BaseBranch = "main"
$Description = "This PR synchronizes the task: 'Triage issues to the service team' part of resourceManagement.yml from table of Service Contact List in ADO wiki page"
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
displayName: Create PR to main branch
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
13 changes: 13 additions & 0 deletions .azure-pipelines/util/analyze-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ steps:
- template: download-build-steps.yml
parameters:
artifactName: build-${{ parameters.testFramework }}
- task: NodeTool@0
displayName: Install autorest
inputs:
versionSpec: '14.17.1'
command: custom
verbose: false
customCommand: install autorest@latest
- task: PowerShell@2
displayName: Setup environment for autorest
inputs:
targetType: inline
script: "$env:NODE_OPTIONS=\"--max-old-space-size=65536\""
pwsh: true

- task: UseDotNet@2
displayName: 'Use .NET Core sdk 6.0.x'
Expand Down
56 changes: 49 additions & 7 deletions .github/ISSUE_TEMPLATE/4-AZ-DOC-BUG.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,68 @@
name: ✒️ Document issue or question
description: Report document related issue
name: ✒️ Documentation issue or question
description: Report documentation related issue
title: '[Doc]: '
labels: [needs-triage]

body:
- type: markdown
attributes:
value: >
Thanks for reporting. Azure PowerShell document includes 3 categories.
Azure PowerShell documentation includes 3 categories:
- Conceptual doc about Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure
- Cmdlet reference doc: https://docs.microsoft.com/en-us/powershell/module
- Engineering doc on Github repo: https://github.com/Azure/azure-powershell
- type: textarea
- type: markdown
attributes:
label: Description
description: >
Please describe issue or question about doc. The link of document is helpful for discussion.
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
- type: dropdown
id: issue-type
attributes:
label: Type of issue
options:
- Typo
- Code doesn't work
- Missing information
- Outdated article
- Other (describe below)
validations:
required: true
- type: textarea
id: userfeedback
validations:
required: true
attributes:
label: Feedback
description: >-
If possible, please provide extended details that will add context and help the team update
the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
For technical or factual errors, please include code snippets and output to show how the
documentation is incorrect.
- type: markdown
attributes:
value: Article information
- type: markdown
attributes:
value: "*If the following fields are automatically filled in for you, please don't modify them*"
- type: input
id: pageUrl
attributes:
label: Page URL
- type: input
id: contentSourceUrl
attributes:
label: Content source URL
- type: input
id: author
attributes:
label: Author
description: GitHub Id of the author
- type: input
id: documentVersionIndependentId
attributes:
label: Document Id
- type: markdown
attributes:
value: >
Expand Down
12 changes: 11 additions & 1 deletion .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1925,6 +1925,17 @@ configuration:
- rajsell
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
- if:
- hasLabel:
label: Service Attention
- hasLabel:
label: NetApp Files
then:
- mentionUsers:
mentionees:
- audunn
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
- if:
- hasLabel:
label: Service Attention
Expand Down Expand Up @@ -2345,7 +2356,6 @@ configuration:
then:
- mentionUsers:
mentionees:
- brjohnstmsft
- bleroy
- tjacobhi
- markheff
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,15 @@ have issues with Azure PowerShell or Azure services.
If there is a feature you would like to see in Azure PowerShell, use the
[`Send-Feedback`][SendFeedback] cmdlet, or file an issue in our [GitHub repo][GitHubRepo].

## Contribute Code
## Contributing
For details on contributing to this repository, see the [contributing guide][Contributing] and the [_Azure PowerShell Developer Guide_][DeveloperGuide].

If you would like to become a contributor to this project, see the instructions provided in
[Microsoft Azure Projects Contribution Guidelines][ContributionGuidelines].
This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit
https://cla.microsoft.com.

Additional information about contributing to this repository can be found in
[`CONTRIBUTING.md`][Contributing] and the [_Azure PowerShell Developer Guide_][DeveloperGuide].
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repositories using our CLA.

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

## Telemetry

Expand Down
Binary file modified VersionInfo.json
Binary file not shown.
50 changes: 0 additions & 50 deletions docker/Dockerfile-alpine-3.13

This file was deleted.

50 changes: 0 additions & 50 deletions docker/Dockerfile-alpine-3.14

This file was deleted.

50 changes: 50 additions & 0 deletions docker/Dockerfile-alpine-3.16
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
FROM mcr.microsoft.com/powershell:alpine-3.16

ARG REPOSITORY=PSGallery
ARG MODULE=Az
ARG CONFIG=config
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
ARG AZURE=/root/.Azure
ARG VCS_REF="none"
ARG BUILD_DATE=
ARG VERSION=
ARG LATEST=
ARG BLOB_URL=
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.16

ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.16"

LABEL maintainer="Azure PowerShell Team <[email protected]>" \
readme.md="http://aka.ms/azpsdockerreadme" \
description="This Dockerfile will install the latest release of Azure PowerShell." \
org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.usage="http://aka.ms/azpsdocker" \
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
org.label-schema.name="azure powershell" \
org.label-schema.vendor="Azure PowerShell" \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0" \
org.label-schema.vcs-ref=${VCS_REF} \
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
org.label-schema.docker.cmd.test="currently not available" \
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"

RUN if [ "${LATEST}" = True ] ; then \
# install latest azure-powershell from BLOB
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
mkdir latest && \
tar -zxvf ./latest.tar.gz -C ./latest && \
pwsh -Command ./latest/InstallModule.ps1 -Scope AllUsers ;\
else \
# install old azure-powershell from PSGallery
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
fi

# create AzureRmContextSettings.json before it was generated
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

CMD [ "pwsh" ]
50 changes: 50 additions & 0 deletions docker/Dockerfile-alpine-3.17
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
FROM mcr.microsoft.com/powershell:alpine-3.17

ARG REPOSITORY=PSGallery
ARG MODULE=Az
ARG CONFIG=config
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
ARG AZURE=/root/.Azure
ARG VCS_REF="none"
ARG BUILD_DATE=
ARG VERSION=
ARG LATEST=
ARG BLOB_URL=
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.17

ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.17"

LABEL maintainer="Azure PowerShell Team <[email protected]>" \
readme.md="http://aka.ms/azpsdockerreadme" \
description="This Dockerfile will install the latest release of Azure PowerShell." \
org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.usage="http://aka.ms/azpsdocker" \
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
org.label-schema.name="azure powershell" \
org.label-schema.vendor="Azure PowerShell" \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0" \
org.label-schema.vcs-ref=${VCS_REF} \
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
org.label-schema.docker.cmd.test="currently not available" \
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"

RUN if [ "${LATEST}" = True ] ; then \
# install latest azure-powershell from BLOB
pwsh -Command Invoke-WebRequest -uri ${BLOB_URL} -OutFile latest.tar.gz && \
mkdir latest && \
tar -zxvf ./latest.tar.gz -C ./latest && \
pwsh -Command ./latest/InstallModule.ps1 -Scope AllUsers;\
else \
# install old azure-powershell from PSGallery
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Scope AllUsers -Repository ${REPOSITORY} && \
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted ;\
fi

# create AzureRmContextSettings.json before it was generated
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

CMD [ "pwsh" ]
Loading

0 comments on commit 3240ca9

Please sign in to comment.