Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@ jobs:
- name: Get latest released version
run: echo "PROVIDER_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Install Terraform
uses: hashicorp/setup-terraform@v3

- name: hclcheck
run: make hclcheck
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ builds:
flags:
- -trimpath
ldflags:
- '-s -w -X github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion={{.Env.BUILDVERSION}}'
- '-s -w -X github.com/schubergphilis/terraform-provider-vcd/v3/vcd.BuildVersion={{.Env.BUILDVERSION}}'
goos:
- freebsd
- windows
Expand Down
6 changes: 2 additions & 4 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ default: build

# builds the plugin injecting output of `git describe` to BuildVersion variable
build: fmtcheck
go install -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"
go install -ldflags="-X 'github.com/schubergphilis/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"

# builds the plugin with race detector enabled and injecting output of `git describe` to BuildVersion variable
buildrace: fmtcheck
go install --race -ldflags="-X 'github.com/vmware/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"

go install --race -ldflags="-X 'github.com/schubergphilis/terraform-provider-vcd/v3/vcd.BuildVersion=$(GIT_DESCRIBE)'"
# creates a .zip archive of the code
dist:
git archive --format=zip -o source.zip HEAD
Expand Down Expand Up @@ -79,7 +78,6 @@ testunit: fmtcheck

# Runs the basic execution test
test: testunit tagverify
@sh -c "'$(CURDIR)/scripts/runtest.sh' short"

# Runs the full acceptance test as Org user
testacc-orguser: testunit
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Terraform VMware Cloud Director Provider
==================

## IMPORTANT: Fork notice

This is a fork of the VCD provider intended for usage at Schuberg Philis. The official provider seems to be no longer
maintained. The aim of this fork is to add some missing functionalities to address the specific needs of Schuberg Philis. Use this fork at your own discretion and risk.

The official Terraform provider for [VMware Cloud Director](https://www.vmware.com/products/cloud-director.html)

- Documentation of the latest binary release available at https://registry.terraform.io/providers/vmware/vcd/latest/docs
Expand Down Expand Up @@ -155,4 +160,4 @@ In this block, the `vmware` part of the source corresponds to the directory

Note that `versions.tf` is generated when you run the `terraform 0.13upgrade` command. If you have run such command,
you need to edit the file and make sure the **`source`** path corresponds to the one installed, or remove the file
altogether if you have already the right block in your script.
altogether if you have already the right block in your script.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.14.2
v3.15.0
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/vmware/terraform-provider-vcd/v3
module github.com/schubergphilis/terraform-provider-vcd/v3

go 1.22.3

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
"github.com/vmware/terraform-provider-vcd/v3/vcd"
"github.com/schubergphilis/terraform-provider-vcd/v3/vcd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ arch=${goos}_${goarch}
# if terraform executable is 0.13+, we use the new path
if [[ $terraform_major -gt 0 || $terraform_major -eq 0 && $terraform_minor > 12 ]]
then
target_dir=$HOME/.terraform.d/plugins/registry.terraform.io/vmware/vcd/$bare_version/$arch
target_dir=$HOME/.terraform.d/plugins/registry.terraform.io/schubergphilis/vcd/$bare_version/$arch
fi

plugin_name=terraform-provider-vcd
Expand Down
1 change: 1 addition & 0 deletions vcd/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ var globalResourceMap = map[string]*schema.Resource{
"vcd_nsxt_alb_virtual_service_http_req_rules": resourceVcdAlbVirtualServiceReqRules(), // 3.14
"vcd_nsxt_alb_virtual_service_http_resp_rules": resourceVcdAlbVirtualServiceRespRules(), // 3.14
"vcd_nsxt_alb_virtual_service_http_sec_rules": resourceVcdAlbVirtualServiceSecRules(), // 3.14
"vcd_nsxt_firewall_rule": resourceVcdNsxtFirewallRule(), // 3.15
}

// Provider returns a terraform.ResourceProvider.
Expand Down
Loading
Loading