update sdks

Makefile

@@ -14,8 +14,7 @@ PROVIDER_PATH   := provider
 VERSION_PATH    := ${PROVIDER_PATH}/pkg/version.Version
 SCHEMA_PATH     := ${PROVIDER_PATH}/cmd/${PROVIDER}/schema.json
 WORKING_DIR     := $(shell pwd)
-VERSION         := $(shell pulumictl get version)
-LATEST_VERSION  := $(shell git describe --tags  --abbrev=0 --match="v[0-9]*" HEAD)
+VERSION         := $(shell git describe --tags  --abbrev=0 --match="v[0-9]*" HEAD)
 
 all: prepare lint build schema test
 
@@ -26,7 +25,7 @@ prepare:
 	done
 
 install_latest:
-	pulumi plugin install resource ${NAME} ${LATEST_VERSION} --server github://api.github.com/threefoldtech/pulumi-threefold
+	pulumi plugin install resource ${NAME} ${VERSION} --server github://api.github.com/threefoldtech/pulumi-threefold
 
 build: gen
 	(cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" $(PROJECT)/${PROVIDER_PATH}/cmd/$(PROVIDER))
@@ -38,7 +37,7 @@ schema:
 	pulumi package get-schema $(WORKING_DIR)/bin/${PROVIDER} > $(WORKING_DIR)/provider/cmd/${PROVIDER}/schema.json
 
 pulumi:
-	[ -x $(shell which pulumi) ] || curl -fsSL https://get.pulumi.com | sh
+	curl -fsSL https://get.pulumi.com | sh
 
 test: 
 	@echo "Running Tests"
@@ -83,7 +82,6 @@ go_sdk:: build
 	rm -rf sdk/go
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language go
 
-nodejs_sdk:: VERSION := $(shell pulumictl get version --language javascript)
 nodejs_sdk:: build
 	rm -rf sdk/nodejs
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language nodejs
@@ -94,15 +92,14 @@ nodejs_sdk:: build
 		sed -i.bak 's/$${VERSION}/$(VERSION)/g' bin/package.json && \
 		rm ./bin/package.json.bak
 
-python_sdk:: PYPI_VERSION := $(shell pulumictl get version --language python)
 python_sdk:: build
 	rm -rf sdk/python
 	pulumi package gen-sdk $(WORKING_DIR)/bin/$(PROVIDER) --language python
 	cp README.md sdk/python/
 	cd sdk/python/ && \
 		python3 setup.py clean --all 2>/dev/null && \
 		rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \
-		sed -i.bak -e 's/^VERSION = .*/VERSION = "$(PYPI_VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \
+		sed -i.bak -e 's/^VERSION = .*/VERSION = "$(VERSION)"/g' -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "$(VERSION)"/g' ./bin/setup.py && \
 		rm ./bin/setup.py.bak && \
 		cd ./bin && python3 setup.py build sdist
 

release.sh

@@ -2,26 +2,29 @@
 
 set -ex 
 
-if [ -z ${VERSION+x} ]
+if [ -z ${RELEASE_VERSION+x} ]
 then
-    echo 'Error! $VERSION is required.'
+    echo 'Error! $RELEASE_VERSION is required.'
     exit 64
 fi
 
-echo $VERSION
+echo $RELEASE_VERSION
 
 make pulumi go_sdk nodejs_sdk python_sdk
+make lint
 goreleaser check
 
 tag_and_push() {
     local component="$1"
-    git tag -a "$component/$VERSION" -m "release $component/$VERSION"
-    git push origin $component/$VERSION
+    git tag -a "$component/$RELEASE_VERSION" -m "release $component/$RELEASE_VERSION"
+    git push origin $component/$RELEASE_VERSION
 }
 
 
 tag_and_push "sdk"
 
 # main
-git tag -a $VERSION -m "release $VERSION"
-git push origin $VERSION
+git tag -a $RELEASE_VERSION -m "release $RELEASE_VERSION"
+git push origin $RELEASE_VERSION
+
+make pulumi go_sdk nodejs_sdk python_sdk