diff --git a/.azdo/azure-pipelines.yml b/.azdo/azure-pipelines.yml index 64e14761..3e37e8e7 100644 --- a/.azdo/azure-pipelines.yml +++ b/.azdo/azure-pipelines.yml @@ -15,7 +15,7 @@ stages: - stage: build pool: name: pool-ubuntu-2004 - displayName: "Build azapi2azurerm" + displayName: "Build aztfmigrate" jobs: - job: build displayName: "Build Binaries" @@ -60,9 +60,9 @@ stages: - script: | set -e mkdir build - name=azapi2azurerm + name=aztfmigrate if [[ $OS = windows ]]; then - name=azapi2azurerm.exe + name=aztfmigrate.exe fi GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X 'main.version=${VERSION}'" -o build/$name displayName: "Go Build" @@ -128,7 +128,7 @@ stages: ARCH: amd64 steps: - task: DownloadPipelineArtifact@2 - displayName: "Download azapi2azurerm binary" + displayName: "Download aztfmigrate binary" inputs: artifact: windows-$(ARCH) path: $(system.defaultWorkingDirectory)/dist/bin @@ -152,10 +152,10 @@ stages: cd $workdir/scripts/package/windows/build declare -A map=( [386]=x86 [amd64]=x64 ) export VERSION=${VERSION:1} - cp $workdir/dist/bin/azapi2azurerm.exe . + cp $workdir/dist/bin/aztfmigrate.exe . candle.exe -arch ${map[$ARCH]} -o setup.wxobj ./setup.wxs mkdir $workdir/dist/output - light.exe -out $workdir/dist/output/azapi2azurerm.msi ./setup.wxobj + light.exe -out $workdir/dist/output/aztfmigrate.msi ./setup.wxobj env: workdir: $(system.defaultWorkingDirectory) VERSION: ${{ parameters.version }} @@ -235,7 +235,7 @@ stages: - script: | set -e - chmod +x $WORKDIR/dist/source/azapi2azurerm + chmod +x $WORKDIR/dist/source/aztfmigrate declare -A deb_arch_map=( [386]=i386 [amd64]=amd64 [arm]=armhf [arm64]=arm64 ) declare -A rpm_arch_map=( [386]=i686 [amd64]=x86_64 [arm]=armv7hl [arm64]=aarch64 ) @@ -243,44 +243,44 @@ stages: # Build the image cd $WORKDIR/scripts/package/linux/build - docker build -t azapi2azurermbuild . + docker build -t aztfmigratebuild . # Build deb package docker run -t --rm \ -v $WORKDIR/dist/source:/build/source \ -v $WORKDIR/dist/output:/build/output \ - azapi2azurermbuild \ + aztfmigratebuild \ fpm \ - --name azapi2azurerm \ + --name aztfmigrate \ --license MPL-2.0 \ --version $version \ --description "A tool to migrate terraform resources from azapi to azurerm" \ - --url "https://github.com/Azure/azapi2azurerm" \ + --url "https://github.com/Azure/aztfmigrate" \ --maintainer "henglu " \ --input-type dir \ --output-type deb \ --architecture ${deb_arch_map[$ARCH]} \ - --package /build/output/azapi2azurerm-$version-1-${deb_arch_map[$ARCH]}.deb \ - /build/source/azapi2azurerm=/usr/bin/azapi2azurerm + --package /build/output/aztfmigrate-$version-1-${deb_arch_map[$ARCH]}.deb \ + /build/source/aztfmigrate=/usr/bin/aztfmigrate # Build rpm package echo $version docker run -t --rm \ -v $WORKDIR/dist/source:/build/source \ -v $WORKDIR/dist/output:/build/output \ - azapi2azurermbuild \ + aztfmigratebuild \ fpm \ - --name azapi2azurerm \ + --name aztfmigrate \ --license MPL-2.0 \ --version ${version} \ --description "A tool to migrate terraform resources from azapi to azurerm" \ - --url "https://github.com/Azure/azapi2azurerm" \ + --url "https://github.com/Azure/aztfmigrate" \ --maintainer "henglu " \ --input-type dir \ --output-type rpm \ --architecture ${rpm_arch_map[$ARCH]} \ - --package /build/output/azapi2azurerm-$version-1-${rpm_arch_map[$ARCH]}.rpm \ - /build/source/azapi2azurerm=/usr/bin/azapi2azurerm + --package /build/output/aztfmigrate-$version-1-${rpm_arch_map[$ARCH]}.rpm \ + /build/source/aztfmigrate=/usr/bin/aztfmigrate displayName: "Build Packages" env: VERSION: ${{ parameters.version }} @@ -339,7 +339,7 @@ stages: runId: ${{ parameters.artifactBuildId }} - script: | set -e - NAME="azapi2azurerm" + NAME="aztfmigrate" OS_ARCH=( "windows:amd64" "windows:386" @@ -354,17 +354,17 @@ stages: for os_arch in "${OS_ARCH[@]}" ; do OS=${os_arch%%:*} ARCH=${os_arch#*:} - name=azapi2azurerm + name=aztfmigrate if [[ $OS = windows ]]; then - name=azapi2azurerm.exe + name=aztfmigrate.exe fi chmod +x dist/${OS}-${ARCH}/${name} zip -j release/${NAME}_${VERSION}_${OS}_${ARCH}.zip dist/${OS}-${ARCH}/${name} done # Copy MSI - cp dist/windows-386-msi/azapi2azurerm.msi release/${NAME}_${VERSION}_x86.msi - cp dist/windows-amd64-msi/azapi2azurerm.msi release/${NAME}_${VERSION}_x64.msi + cp dist/windows-386-msi/aztfmigrate.msi release/${NAME}_${VERSION}_x86.msi + cp dist/windows-amd64-msi/aztfmigrate.msi release/${NAME}_${VERSION}_x64.msi cd release shasum -a 256 *.zip *.msi > ${NAME}_SHA256SUMS @@ -400,7 +400,7 @@ stages: - task: GitHubRelease@1 displayName: "Draft Github Release" inputs: - gitHubConnection: 'azapi2azurerm' + gitHubConnection: 'aztfmigrate' repositoryName: '$(Build.Repository.Name)' action: 'create' target: '$(Build.SourceVersion)' diff --git a/.azdo/azurerm-schema-update-pipeline.yml b/.azdo/azurerm-schema-update-pipeline.yml index afbca52e..f2ba54f2 100644 --- a/.azdo/azurerm-schema-update-pipeline.yml +++ b/.azdo/azurerm-schema-update-pipeline.yml @@ -39,7 +39,7 @@ steps: git config --global user.email "henglu@microsoft.com" git config --global user.name "Heng Lu" git clone https://ms-henglu:$PAT@github.com/ms-henglu/terraform-provider-azurerm.git - git clone https://ms-henglu:$PAT@github.com/Azure/azapi2azurerm.git + git clone https://ms-henglu:$PAT@github.com/Azure/aztfmigrate.git cd terraform-provider-azurerm git remote add hashi https://ms-henglu:$PAT@github.com/hashicorp/terraform-provider-azurerm.git git remote @@ -55,7 +55,7 @@ steps: - bash: | export GOROOT=/usr/local/go export PATH=$GOROOT/bin:$PATH - cd azapi2azurerm/.tools/generate-provider-schema + cd aztfmigrate/.tools/generate-provider-schema pwd chmod -R +x ./run.sh ./run.sh /mnt/vss/_work/1/s/terraform-provider-azurerm ${{ parameters.branch }} @@ -65,7 +65,7 @@ steps: export GOROOT=/usr/local/go export PATH=$GOROOT/bin:$PATH export TAG=$(step1.TAG) - cd azapi2azurerm + cd aztfmigrate make fmt git add . git status diff --git a/azurerm/coverage/coverage_test.go b/azurerm/coverage/coverage_test.go index 44fb065a..a1dec16e 100644 --- a/azurerm/coverage/coverage_test.go +++ b/azurerm/coverage/coverage_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/Azure/azapi2azurerm/azurerm/coverage" + "github.com/Azure/aztfmigrate/azurerm/coverage" ) func Test_GetCoverage(t *testing.T) { diff --git a/azurerm/hcl_schema.go b/azurerm/hcl_schema.go index 0ae37e76..f6ae2a45 100644 --- a/azurerm/hcl_schema.go +++ b/azurerm/hcl_schema.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/Azure/azapi2azurerm/azurerm/schema" + "github.com/Azure/aztfmigrate/azurerm/schema" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/zclconf/go-cty/cty" diff --git a/cmd/migrate_command.go b/cmd/migrate_command.go index 4f2a4226..b37d8b91 100644 --- a/cmd/migrate_command.go +++ b/cmd/migrate_command.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/Azure/azapi2azurerm/tf" - "github.com/Azure/azapi2azurerm/types" + "github.com/Azure/aztfmigrate/tf" + "github.com/Azure/aztfmigrate/types" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/mitchellh/cli" ) @@ -79,8 +79,8 @@ func (c *MigrateCommand) Run(args []string) int { func (c *MigrateCommand) Help() string { helpText := ` -Usage: azapi2azurerm migrate -` + c.Synopsis() + "\nThe Terraform addresses listed in file `azapi2azurerm.ignore` will be ignored during migration.\n\n" + helpForFlags(c.flags()) +Usage: aztfmigrate migrate +` + c.Synopsis() + "\nThe Terraform addresses listed in file `aztfmigrate.ignore` will be ignored during migration.\n\n" + helpForFlags(c.flags()) return strings.TrimSpace(helpText) } diff --git a/cmd/migrate_command_test.go b/cmd/migrate_command_test.go index 832d5e89..722b2f9c 100644 --- a/cmd/migrate_command_test.go +++ b/cmd/migrate_command_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/Azure/azapi2azurerm/azurerm" - "github.com/Azure/azapi2azurerm/cmd" - "github.com/Azure/azapi2azurerm/tf" - "github.com/Azure/azapi2azurerm/types" + "github.com/Azure/aztfmigrate/azurerm" + "github.com/Azure/aztfmigrate/cmd" + "github.com/Azure/aztfmigrate/tf" + "github.com/Azure/aztfmigrate/types" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclwrite" "github.com/mitchellh/cli" @@ -199,7 +199,7 @@ func init() { } func tempDir(t *testing.T) string { - tmpDir := filepath.Join(os.TempDir(), "azapi2azurerm", t.Name()) + tmpDir := filepath.Join(os.TempDir(), "aztfmigrate", t.Name()) err := os.MkdirAll(tmpDir, 0o755) if err != nil && !os.IsExist(err) { t.Fatal(err) diff --git a/cmd/plan_command.go b/cmd/plan_command.go index 6167ef9b..83988937 100644 --- a/cmd/plan_command.go +++ b/cmd/plan_command.go @@ -9,9 +9,9 @@ import ( "path" "strings" - "github.com/Azure/azapi2azurerm/azurerm" - "github.com/Azure/azapi2azurerm/tf" - "github.com/Azure/azapi2azurerm/types" + "github.com/Azure/aztfmigrate/azurerm" + "github.com/Azure/aztfmigrate/tf" + "github.com/Azure/aztfmigrate/types" "github.com/mitchellh/cli" ) @@ -65,8 +65,8 @@ func (c *PlanCommand) Run(args []string) int { func (c *PlanCommand) Help() string { helpText := ` -Usage: azapi2azurerm plan -` + c.Synopsis() + "\nThe Terraform addresses listed in file `azapi2azurerm.ignore` will be ignored during migration.\n\n" + helpForFlags(c.flags()) +Usage: aztfmigrate plan +` + c.Synopsis() + "\nThe Terraform addresses listed in file `aztfmigrate.ignore` will be ignored during migration.\n\n" + helpForFlags(c.flags()) return strings.TrimSpace(helpText) } @@ -87,7 +87,7 @@ func (c *PlanCommand) Plan(terraform *tf.Terraform, isPlanOnly bool) []types.Azu unsupportedMessage := "The following resources can't be migrated:\n" ignoreMessage := "The following resources will be ignored in migration:\n" ignoreSet := make(map[string]bool) - if file, err := os.ReadFile(path.Join(terraform.GetWorkingDirectory(), "azapi2azurerm.ignore")); err == nil { + if file, err := os.ReadFile(path.Join(terraform.GetWorkingDirectory(), "aztfmigrate.ignore")); err == nil { lines := strings.Split(string(file), "\n") for _, line := range lines { line = strings.TrimSpace(line) diff --git a/cmd/plan_command_test.go b/cmd/plan_command_test.go index 2fa4b58f..27fc44cd 100644 --- a/cmd/plan_command_test.go +++ b/cmd/plan_command_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/Azure/azapi2azurerm/cmd" - "github.com/Azure/azapi2azurerm/tf" + "github.com/Azure/aztfmigrate/cmd" + "github.com/Azure/aztfmigrate/tf" "github.com/mitchellh/cli" ) diff --git a/cmd/version_command.go b/cmd/version_command.go index 0bb051cf..eb704735 100644 --- a/cmd/version_command.go +++ b/cmd/version_command.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - "github.com/Azure/azapi2azurerm/azurerm/schema" + "github.com/Azure/aztfmigrate/azurerm/schema" "github.com/mitchellh/cli" ) @@ -75,7 +75,7 @@ func (c *VersionCommand) Run(args []string) int { func (c *VersionCommand) Help() string { helpText := ` -Usage: azapi2azurerm version [-json] +Usage: aztfmigrate version [-json] ` + c.Synopsis() + "\n\n" + helpForFlags(c.flags()) return strings.TrimSpace(helpText) diff --git a/go.mod b/go.mod index 8e60f13f..fbadb292 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Azure/azapi2azurerm +module github.com/Azure/aztfmigrate go 1.22.0 diff --git a/main.go b/main.go index c0650989..6dfdc743 100644 --- a/main.go +++ b/main.go @@ -3,13 +3,13 @@ package main import ( "os" - "github.com/Azure/azapi2azurerm/cmd" + "github.com/Azure/aztfmigrate/cmd" "github.com/mitchellh/cli" ) func main() { c := &cli.CLI{ - Name: "azapi2azurerm", + Name: "aztfmigrate", Version: version, Args: os.Args[1:], HelpWriter: os.Stdout, diff --git a/readme.md b/readme.md index 31154e0b..44e78508 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# azapi2azurerm +# aztfmigrate ## Introduction This tool is used to migrate resources between terraform `azapi` provider and `azurerm` provider. @@ -6,8 +6,8 @@ This tool is used to migrate resources between terraform `azapi` provider and `a ## Command Usage ``` -PS C:\Users\henglu\go\src\github.com\Azure\azapi2azurerm> azapi2azurerm.exe -Usage: azapi2azurerm [--version] [--help] [] +PS C:\Users\henglu\go\src\github.com\Azure\aztfmigrate> aztfmigrate.exe +Usage: aztfmigrate [--version] [--help] [] Available commands are: migrate Migrate azapi resources to azurerm resources in current working directory @@ -15,9 +15,9 @@ Available commands are: version Displays the version of the migration tool ``` -1. Run `azapi2azurerm plan -target-provider=azurerm` under your terraform working directory, +1. Run `aztfmigrate plan -target-provider=azurerm` under your terraform working directory, it will list all resources that can be migrated from `azapi` provider to `azurerm` provider. - The Terraform addresses listed in file `azapi2azurerm.ignore` will be ignored during migration. + The Terraform addresses listed in file `aztfmigrate.ignore` will be ignored during migration. ``` 2022/01/25 14:34:46 [INFO] searching azapi_resource & azapi_update_resource... 2022/01/25 14:34:55 [INFO] @@ -33,31 +33,31 @@ azapi_resource.test: input properties not supported: [], output properties not s The following resources will be ignored in migration: ``` -2. Run `azapi2azurerm migrate -target-provider=azurerm` under your terraform working directory, +2. Run `aztfmigrate migrate -target-provider=azurerm` under your terraform working directory, it will migrate above resources from `azapi` provider to `azurerm` provider, both terraform configuration and state. - The Terraform addresses listed in file `azapi2azurerm.ignore` will be ignored during migration. + The Terraform addresses listed in file `aztfmigrate.ignore` will be ignored during migration. ## Examples There're some examples to show the migration results. -1. [case1 - basic](https://github.com/Azure/azapi2azurerm/tree/master/examples/case1%20-%20basic) -2. [case2 - for_each](https://github.com/Azure/azapi2azurerm/tree/master/examples/case2%20-%20for_each) -3. [case3 - nested block](https://github.com/Azure/azapi2azurerm/tree/master/examples/case3%20-%20nested%20block) -4. [case4 - count](https://github.com/Azure/azapi2azurerm/tree/master/examples/case4%20-%20count) -5. [case5 - nested block patch](https://github.com/Azure/azapi2azurerm/tree/master/examples/case5%20-%20nested%20block%20patch) -6. [case6 - meta argument](https://github.com/Azure/azapi2azurerm/tree/master/examples/case6%20-%20meta%20arguments) -7. [case7 - ignore](https://github.com/Azure/azapi2azurerm/tree/master/examples/case7%20-%20ignore) +1. [case1 - basic](https://github.com/Azure/aztfmigrate/tree/master/examples/case1%20-%20basic) +2. [case2 - for_each](https://github.com/Azure/aztfmigrate/tree/master/examples/case2%20-%20for_each) +3. [case3 - nested block](https://github.com/Azure/aztfmigrate/tree/master/examples/case3%20-%20nested%20block) +4. [case4 - count](https://github.com/Azure/aztfmigrate/tree/master/examples/case4%20-%20count) +5. [case5 - nested block patch](https://github.com/Azure/aztfmigrate/tree/master/examples/case5%20-%20nested%20block%20patch) +6. [case6 - meta argument](https://github.com/Azure/aztfmigrate/tree/master/examples/case6%20-%20meta%20arguments) +7. [case7 - ignore](https://github.com/Azure/aztfmigrate/tree/master/examples/case7%20-%20ignore) ## Install ### From Release -Precompiled binaries and Window MSI are available at [Releases](https://github.com/Azure/azapi2azurerm/releases). +Precompiled binaries and Window MSI are available at [Releases](https://github.com/Azure/aztfmigrate/releases). For Mac OS users, you need to run the following command to remove the quarantine flag. ```bash -xattr -d com.apple.quarantine azapi2azurerm +xattr -d com.apple.quarantine aztfmigrate ``` ### From Package Manager @@ -85,7 +85,7 @@ Supported versions: 3. Install: ``` - dnf install azapi2azurerm + dnf install aztfmigrate ``` #### apt (Linux) @@ -111,13 +111,13 @@ Supported versions: 3. Install: ``` - apt-get install azapi2azurerm + apt-get install aztfmigrate ``` #### AUR (Linux) ```bash -yay -S azapi2azurerm +yay -S aztfmigrate ``` ## Features @@ -130,7 +130,7 @@ yay -S azapi2azurerm - [x] Support dependency injection in Map and other complicated struct value. - [x] Support user input when there're multiple/none `azurerm` resource match for the resource id - [x] Support migration based on `azurerm` provider's property coverage -- [x] Support ignore terraform addresses listed in file `azapi2azurerm.ignore` +- [x] Support ignore terraform addresses listed in file `aztfmigrate.ignore` - [ ] Support data source `azapi_resource` migration. ## Known limitations diff --git a/scripts/package/linux/verify/centos-8.sh b/scripts/package/linux/verify/centos-8.sh index 79c04a81..128a7de7 100755 --- a/scripts/package/linux/verify/centos-8.sh +++ b/scripts/package/linux/verify/centos-8.sh @@ -14,11 +14,11 @@ while ((count <= total)); do echo "Try ($count/$total)" # See: https://access.redhat.com/solutions/2779441 dnf check-update --refresh || [[ $? == 100 ]] - dnf install -y azapi2azurerm && break + dnf install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/debian-bullseye.sh b/scripts/package/linux/verify/debian-bullseye.sh index 88e362ee..bb8a6293 100755 --- a/scripts/package/linux/verify/debian-bullseye.sh +++ b/scripts/package/linux/verify/debian-bullseye.sh @@ -13,11 +13,11 @@ count=1 while ((count <= total)); do echo "Try ($count/$total)" apt-get update - apt-get install -y azapi2azurerm && break + apt-get install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/debian-buster.sh b/scripts/package/linux/verify/debian-buster.sh index d0a654f9..ff7398be 100755 --- a/scripts/package/linux/verify/debian-buster.sh +++ b/scripts/package/linux/verify/debian-buster.sh @@ -13,11 +13,11 @@ count=1 while ((count <= total)); do echo "Try ($count/$total)" apt-get update - apt-get install -y azapi2azurerm && break + apt-get install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/fedora-34.sh b/scripts/package/linux/verify/fedora-34.sh index 28d95bfd..84d20eb6 100755 --- a/scripts/package/linux/verify/fedora-34.sh +++ b/scripts/package/linux/verify/fedora-34.sh @@ -16,11 +16,11 @@ while ((count <= total)); do echo "Try ($count/$total)" # See: https://access.redhat.com/solutions/2779441 dnf check-update --refresh || [[ $? == 100 ]] - dnf install -y azapi2azurerm && break + dnf install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/fedora-35.sh b/scripts/package/linux/verify/fedora-35.sh index d2432375..b903df16 100755 --- a/scripts/package/linux/verify/fedora-35.sh +++ b/scripts/package/linux/verify/fedora-35.sh @@ -16,11 +16,11 @@ while ((count <= total)); do echo "Try ($count/$total)" # See: https://access.redhat.com/solutions/2779441 dnf check-update --refresh || [[ $? == 100 ]] - dnf install -y azapi2azurerm && break + dnf install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/fedora-36.sh b/scripts/package/linux/verify/fedora-36.sh index 913169bc..a13b84b2 100755 --- a/scripts/package/linux/verify/fedora-36.sh +++ b/scripts/package/linux/verify/fedora-36.sh @@ -16,11 +16,11 @@ while ((count <= total)); do echo "Try ($count/$total)" # See: https://access.redhat.com/solutions/2779441 dnf check-update --refresh || [[ $? == 100 ]] - dnf install -y azapi2azurerm && break + dnf install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/ubuntu-bionic.sh b/scripts/package/linux/verify/ubuntu-bionic.sh index 2ac094a2..50f29336 100755 --- a/scripts/package/linux/verify/ubuntu-bionic.sh +++ b/scripts/package/linux/verify/ubuntu-bionic.sh @@ -13,11 +13,11 @@ count=1 while ((count <= total)); do echo "Try ($count/$total)" apt-get update - apt-get install -y azapi2azurerm && break + apt-get install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/ubuntu-focal.sh b/scripts/package/linux/verify/ubuntu-focal.sh index e3f4649a..b608f200 100755 --- a/scripts/package/linux/verify/ubuntu-focal.sh +++ b/scripts/package/linux/verify/ubuntu-focal.sh @@ -13,11 +13,11 @@ count=1 while ((count <= total)); do echo "Try ($count/$total)" apt-get update - apt-get install -y azapi2azurerm && break + apt-get install -y aztfmigrate && break sleep 1m ((count++)) done (( count <= total )) -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/linux/verify/ubuntu-jammy.sh b/scripts/package/linux/verify/ubuntu-jammy.sh index e0f3f220..df877da3 100755 --- a/scripts/package/linux/verify/ubuntu-jammy.sh +++ b/scripts/package/linux/verify/ubuntu-jammy.sh @@ -13,10 +13,10 @@ count=1 while ((count <= total)); do echo "Try ($count/$total)" apt-get update - apt-get install -y azapi2azurerm && break + apt-get install -y aztfmigrate && break sleep 1m ((count++)) done -grep $version <(azapi2azurerm -v) +grep $version <(aztfmigrate -v) diff --git a/scripts/package/windows/build/setup.wxs b/scripts/package/windows/build/setup.wxs index 548e56ae..f39c9944 100644 --- a/scripts/package/windows/build/setup.wxs +++ b/scripts/package/windows/build/setup.wxs @@ -6,13 +6,13 @@ - + - + - + @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - +