diff --git a/Makefile b/Makefile index fbb1ebc..49858f2 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ ORG := ctfer-io PROJECT := github.com/${ORG}/pulumi-${PACK} NODE_MODULE_NAME := @ctfer-io/${PACK} TF_NAME := ${PACK} -PROVIDER_PATH := provider -VERSION_PATH := ${PROVIDER_PATH}/v2/pkg/version.Version +PROVIDER_PATH := provider/v2 +VERSION_PATH := ${PROVIDER_PATH}/pkg/version.Version TFGEN := pulumi-tfgen-${PACK} PROVIDER := pulumi-resource-${PACK} @@ -48,12 +48,12 @@ build:: install_plugins provider build_sdks install_sdks only_build:: build tfgen:: install_plugins - (cd provider && go build -o $(WORKING_DIR)/bin/${TFGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/v2/cmd/${TFGEN}) + (cd provider && go build -o $(WORKING_DIR)/bin/${TFGEN} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/${TFGEN}) $(WORKING_DIR)/bin/${TFGEN} schema --out provider/cmd/${PROVIDER} (cd provider && VERSION=$(VERSION) go generate cmd/${PROVIDER}/main.go) provider:: tfgen install_plugins # build the provider binary - (cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/v2/cmd/${PROVIDER}) + (cd provider && go build -o $(WORKING_DIR)/bin/${PROVIDER} -ldflags "-X ${PROJECT}/${VERSION_PATH}=${VERSION}" ${PROJECT}/${PROVIDER_PATH}/cmd/${PROVIDER}) build_sdks:: install_plugins provider build_nodejs build_python build_go build_dotnet # build all the sdks diff --git a/provider/go.mod b/provider/go.mod index 2810af9..276fb04 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -40,6 +40,8 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/ctfer-io/go-ctfd v0.10.2 // indirect + github.com/ctfer-io/pulumi-ctfd/provider v0.0.0-20241216163456-c0d18a3ed1f4 // indirect + github.com/ctfer-io/terraform-provider-ctfd v1.0.1 // indirect github.com/cyphar/filepath-securejoin v0.3.6 // indirect github.com/deckarep/golang-set/v2 v2.5.0 // indirect github.com/djherbis/times v1.5.0 // indirect diff --git a/provider/go.sum b/provider/go.sum index 09a6682..75feaa7 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -323,6 +323,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/ctfer-io/go-ctfd v0.10.2 h1:DpQSaxcHN7ugC72xlpEl0HIUbusOSolPkWD8Ki7vc7U= github.com/ctfer-io/go-ctfd v0.10.2/go.mod h1:ebgSW8LdP/qtRCpglK4djBp+g6kU5YM98XBZKowiCeY= +github.com/ctfer-io/pulumi-ctfd/provider v0.0.0-20241216163456-c0d18a3ed1f4 h1:EC7A/lS35Um1jwp/1Intwj9T+pYP2Lbo2icXdbNgwmY= +github.com/ctfer-io/pulumi-ctfd/provider v0.0.0-20241216163456-c0d18a3ed1f4/go.mod h1:fepRVUoluPdMr3xxaj19swX10hAT3zqsM5lK7O7gLvA= +github.com/ctfer-io/terraform-provider-ctfd v1.0.1 h1:fptGHCEMHGwKeLK7q4jbu6bXFPQjph+57bo26SjXA3g= +github.com/ctfer-io/terraform-provider-ctfd v1.0.1/go.mod h1:Jr0jBWbzxGxobdlfIEzMZGo61ftO5NrzpxeZH6eDbnw= github.com/ctfer-io/terraform-provider-ctfd/v2 v2.2.0 h1:ZbbcrpYQTJU76kvfKQNm80Daziuq2QgSk71rZ+GXZZU= github.com/ctfer-io/terraform-provider-ctfd/v2 v2.2.0/go.mod h1:xXn075uZ3WrNwxagzNke4guvEu+JLwQemk8qhQkRrkg= github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=