diff --git a/Makefile b/Makefile index 12d2ac9..34735e5 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,32 @@ TEST?=$$(go list ./... | grep -v 'vendor') HOSTNAME=digitalenergy.online NAMESPACE=decort NAME=terraform-provider-decort +BINDIR = ./bin +ZIPDIR = ./zip #BINARY=terraform-provider-${NAME} BINARY=${NAME}.exe WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} MAINPATH = ./cmd/decort/ -VERSION=1.1 +VERSION=3.5.1 #OS_ARCH=darwin_amd64 OS_ARCH=windows_amd64 #OS_ARCH=linux_amd64 +FILES= ${BINARY}_${VERSION}_darwin_amd64\ + ${BINARY}_${VERSION}_freebsd_386\ + ${BINARY}_${VERSION}_freebsd_amd64\ + ${BINARY}_${VERSION}_freebsd_arm\ + ${BINARY}_${VERSION}_linux_386\ + ${BINARY}_${VERSION}_linux_amd64\ + ${BINARY}_${VERSION}_linux_arm\ + ${BINARY}_${VERSION}_openbsd_386\ + ${BINARY}_${VERSION}_openbsd_amd64\ + ${BINARY}_${VERSION}_solaris_amd64\ + ${BINARY}_${VERSION}_windows_386 \ + ${BINARY}_${VERSION}_windows_amd64\ + +BINS = $(addprefix bin/, $(FILES)) + default: install image: @@ -29,19 +46,30 @@ st: build: go build -o ${BINARY} ${MAINPATH} -release: - GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64 - GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386 - GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64 - GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm - GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386 - GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64 - GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm - GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386 - GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64 - GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64 - GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386 - GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64 +release: $(FILES) + +$(FILES) : $(BINDIR) $(ZIPDIR) $(BINS) + zip -r $(ZIPDIR)/$@.zip $(BINDIR)/$@ + +$(BINDIR): + mkdir $@ + +$(ZIPDIR): + mkdir $@ + +$(BINS): + GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64 $(MAINPATH) + GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386 $(MAINPATH) + GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64 $(MAINPATH) + GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm $(MAINPATH) + GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386 $(MAINPATH) + GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64 $(MAINPATH) + GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm $(MAINPATH) + GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386 $(MAINPATH) + GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64 $(MAINPATH) + GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64 $(MAINPATH) + GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386 $(MAINPATH) + GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64 $(MAINPATH) install: build mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH} diff --git a/README.md b/README.md index 470c60c..3f63d6c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration - Режим пользователя, - Режим администратора. Для переключения между режимами используйте флаг DECORT_ADMIN_MODE. - Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki + Вики проекта: https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki ## Возможности провайдера @@ -40,7 +40,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration - Работа с locations, - Работа с load balancer. -Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki +Вики проекта: https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki ## Начало @@ -158,7 +158,7 @@ terraform init Примеры работы можно найти: -- На вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki +- На вики проекта: https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki - В папке `samples` Схемы к terraform'у доступны: diff --git a/README_EN.md b/README_EN.md index 46b2807..5b473dd 100644 --- a/README_EN.md +++ b/README_EN.md @@ -19,7 +19,7 @@ The provider support two working modes: - User mode, - Administator mode. Use flag DECORT_ADMIN_MODE for swithcing beetwen modes. - See user guide at https://github.com/rudecs/terraform-provider-decort/wiki + See user guide at https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki ## Features @@ -42,7 +42,7 @@ The provider support two working modes: This provider supports Import operations on pre-existing resources. -See user guide at https://github.com/rudecs/terraform-provider-decort/wiki +See user guide at https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki ## Get Started @@ -158,7 +158,7 @@ More details about the provider's building process: https://learn.hashicorp.com/ ## Examples and Samples -- Examples: https://github.com/rudecs/terraform-provider-decort/wiki +- Examples: https://repos.digitalenergy.online/BASIS/terraform-provider-decort/wiki - Samples: see in repository `samples` Terraform schemas in: diff --git a/internal/service/cloudapi/rg/resource_rg.go b/internal/service/cloudapi/rg/resource_rg.go index 87e515b..de6d0d0 100644 --- a/internal/service/cloudapi/rg/resource_rg.go +++ b/internal/service/cloudapi/rg/resource_rg.go @@ -304,7 +304,7 @@ func resourceResgroupUpdate(ctx context.Context, d *schema.ResourceData, m inter d.Get("name").(string), d.Get("account_id").(int)) c := m.(*controller.ControllerCfg) - urlValues := &url.Values{} + urlValues := &url.Values{} // Check input values // AccountID