Merge pull request #2 from schubergphilis/edge-firewall-rule-v2

feat: Add resource_vcd_nsxt_firewall_rule resource

Author: tomsnuvv

.github/workflows/check-docs.yml

@@ -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

.goreleaser.yml

@@ -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

GNUmakefile

@@ -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
@@ -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

README.md

@@ -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
@@ -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.

VERSION

@@ -1 +1 @@
-v3.14.2
+v3.15.0

go.mod

@@ -1,4 +1,4 @@
-module github.com/vmware/terraform-provider-vcd/v3
+module github.com/schubergphilis/terraform-provider-vcd/v3
 
 go 1.22.3
 

main.go

@@ -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() {

scripts/install-plugin.sh

@@ -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

vcd/provider.go

@@ -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.