Skip to content

Commit

Permalink
Merge pull request #18 from crossplane-contrib/upjet
Browse files Browse the repository at this point in the history
convert Terrajet to Upjet
  • Loading branch information
displague authored Mar 5, 2023
2 parents 3b732b9 + 09c5d87 commit cec28fd
Show file tree
Hide file tree
Showing 147 changed files with 9,112 additions and 1,230 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/new_resource_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Help us for prioritization of the resource support by giving more details about
why you need it.
-->

### Would you be willing to contribute it using [Terrajet](https://github.com/crossplane/terrajet)?
### Would you be willing to contribute it using [Upjet](https://github.com/upbound/upjet)?

<!--
Please take a look at code generator instructions to see whether you'd like to
contribute the missing parts where Terrajet cannot automate. See
https://github.com/crossplane/terrajet#readme
contribute the missing parts where Upjet cannot automate. See
https://github.com/upbound/upjet#readme
-->
19 changes: 16 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

PROJECT_NAME := provider-jet-equinix
PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)
GOLANGCILINT_VERSION ?= 1.48.0
GO_REQUIRED_VERSION ?= 1.19
GOLANGCILINT_VERSION ?= 1.50.0

export TERRAFORM_VERSION := 1.3.1

Expand All @@ -12,6 +13,10 @@ export TERRAFORM_PROVIDER_VERSION := 1.11.1
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-equinix
export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://releases.hashicorp.com/${TERRAFORM_PROVIDER_DOWNLOAD_NAME}/${TERRAFORM_PROVIDER_VERSION}
export TERRAFORM_NATIVE_PROVIDER_BINARY := ${TERRAFORM_PROVIDER_DOWNLOAD_NAME}_v${TERRAFORM_PROVIDER_VERSION}
export TERRAFORM_PROVIDER_REPO ?= https://github.com/equinix/terraform-provider-equinix
export TERRAFORM_DOCS_PATH ?= docs/resources



PLATFORMS ?= linux_amd64 linux_arm64

Expand Down Expand Up @@ -108,9 +113,17 @@ $(TERRAFORM_PROVIDER_SCHEMA): $(TERRAFORM)
@$(TERRAFORM) -chdir=$(TERRAFORM_WORKDIR) providers schema -json=true > $(TERRAFORM_PROVIDER_SCHEMA) 2>> $(TERRAFORM_WORKDIR)/terraform-logs.txt
@$(OK) generating provider schema for $(TERRAFORM_PROVIDER_SOURCE) $(TERRAFORM_PROVIDER_VERSION)

generate.init: $(TERRAFORM_PROVIDER_SCHEMA)

.PHONY: $(TERRAFORM_PROVIDER_SCHEMA)
pull-docs:
@if [ ! -d "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" ]; then \
mkdir -p "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" && \
git clone -c advice.detachedHead=false --depth 1 --filter=blob:none --branch "v$(TERRAFORM_PROVIDER_VERSION)" --sparse "$(TERRAFORM_PROVIDER_REPO)" "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)"; \
fi
@git -C "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" sparse-checkout set "$(TERRAFORM_DOCS_PATH)"

generate.init: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs

.PHONY: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
# ====================================================================================
# Targets

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Terrajet Equinix Provider
# Upjet Equinix Provider

`provider-jet-equinix` is a [Crossplane](https://crossplane.io/) provider that
is built using [Terrajet](https://github.com/crossplane/terrajet) code
is built using [Upjet](https://github.com/upbound/upjet) code
generation tools and exposes XRM-conformant managed resources for the
Equinix API.

Expand Down
2 changes: 1 addition & 1 deletion apis/ecx/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions apis/ecx/v1alpha1/zz_generated_terraformed.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/ecx/v1alpha1/zz_groupversion_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cec28fd

Please sign in to comment.