fix: move implementation to framework

docs/resources/generic_openid_connect_account.md → docs/resources/generic_oidc_account.md

@@ -1,19 +1,19 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "octopusdeploy_generic_openid_connect_account Resource - terraform-provider-octopusdeploy"
+page_title: "octopusdeploy_generic_oidc_account Resource - terraform-provider-octopusdeploy"
 subcategory: ""
 description: |-
-  This resource manages Generic OpenID Connect accounts in Octopus Deploy.
+  This resource manages a Generic OIDC Account in Octopus Deploy.
 ---
 
 # octopusdeploy_generic_openid_connect_account (Resource)
 
-This resource manages Generic OpenID Connect accounts in Octopus Deploy.
+This resource manages a Generic OIDC Account in Octopus Deploy.
 
 ## Example Usage
 
 ```terraform
-resource "octopusdeploy_generic_openid_connect_account" "example" {
+resource "octopusdeploy_generic_oidc_account" "example" {
   name            = "Generic OpenID Connect Account (OK to Delete)"
   execution_subject_keys = ["space", "project"]
   audience = "api://default"
@@ -29,10 +29,10 @@ resource "octopusdeploy_generic_openid_connect_account" "example" {
 
 ### Optional
 
-- `audience` (String) Federated credentials audience, this value is used to establish a connection between external workload identities and Microsoft Entra ID.
-- `description` (String) The description of this Generic OpenID Connect account.
+- `audience` (String) The audience associated with this resource.
+- `description` (String) The description of this generic oidc account.
 - `environments` (List of String) A list of environment IDs associated with this resource.
-- `execution_subject_keys` (List of String) Keys to include in a deployment or runbook. Valid options are `space`, `environment`, `project`, `tenant`, `runbook`, `account`, `type`
+- `execution_subject_keys` (List of String) Keys to include in a deployment or runbook. Valid options are `space`, `environment`, `project`, `tenant`, `runbook`, `account`, `type`.
 - `id` (String) The unique ID for this resource.
 - `space_id` (String) The space ID associated with this resource.
 - `tenant_tags` (List of String) A list of tenant tags associated with this resource.

go.mod

@@ -3,7 +3,7 @@ module github.com/OctopusDeploy/terraform-provider-octopusdeploy
 go 1.21
 
 require (
-	github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241202024636-075a4f06c227
+	github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241203052254-726a1dc47be5
 	github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240729041805-46db6fb717b4
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637

go.sum

@@ -20,10 +20,8 @@ github.com/Microsoft/hcsshim v0.12.4 h1:Ev7YUMHAHoWNm+aDSPzc5W9s6E2jyL1szpVDJeZ/
 github.com/Microsoft/hcsshim v0.12.4/go.mod h1:Iyl1WVpZzr+UkzjekHZbV8o5Z9ZkxNGx6CtY2Qg/JVQ=
 github.com/OctopusDeploy/go-octodiff v1.0.0 h1:U+ORg6azniwwYo+O44giOw6TiD5USk8S4VDhOQ0Ven0=
 github.com/OctopusDeploy/go-octodiff v1.0.0/go.mod h1:Mze0+EkOWTgTmi8++fyUc6r0aLZT7qD9gX+31t8MmIU=
-github.com/OctopusDeploy/go-octopusdeploy/v2 v2.60.0 h1:9j4IQ1UcAuaTytlBzQ7Mmoy/dLtofYfSGNiM22+sLXs=
-github.com/OctopusDeploy/go-octopusdeploy/v2 v2.60.0/go.mod h1:ggvOXzMnq+w0pLg6C9zdjz6YBaHfO3B3tqmmB7JQdaw=
-github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241202024636-075a4f06c227 h1:ejQL4mdWMoF7PhOQUu/G4hZHfFYbXg+XuvXtMpFpllw=
-github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241202024636-075a4f06c227/go.mod h1:ggvOXzMnq+w0pLg6C9zdjz6YBaHfO3B3tqmmB7JQdaw=
+github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241203052254-726a1dc47be5 h1:axZMwMhboAz4bE4GmzRkT9ogE4bgjrPvNZef9rJCINE=
+github.com/OctopusDeploy/go-octopusdeploy/v2 v2.62.3-0.20241203052254-726a1dc47be5/go.mod h1:ggvOXzMnq+w0pLg6C9zdjz6YBaHfO3B3tqmmB7JQdaw=
 github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240729041805-46db6fb717b4 h1:QfbVf0bOIRMp/WHAWsuVDB7KHoWnRsGbvDuOf2ua7k4=
 github.com/OctopusSolutionsEngineering/OctopusTerraformTestFramework v0.0.0-20240729041805-46db6fb717b4/go.mod h1:Oq9KbiRNDBB5jFmrwnrgLX0urIqR/1ptY18TzkqXm7M=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg=

octopusdeploy/provider.go

@@ -46,7 +46,6 @@ func Provider() *schema.Provider {
 			"octopusdeploy_deployment_process":                             resourceDeploymentProcess(),
 			"octopusdeploy_dynamic_worker_pool":                            resourceDynamicWorkerPool(),
 			"octopusdeploy_gcp_account":                                    resourceGoogleCloudPlatformAccount(),
-			"octopusdeploy_generic_openid_connect_account":                 resourceGenericOpenIDConnectAccount(),
 			"octopusdeploy_kubernetes_agent_deployment_target":             resourceKubernetesAgentDeploymentTarget(),
 			"octopusdeploy_kubernetes_agent_worker":                        resourceKubernetesAgentWorker(),
 			"octopusdeploy_kubernetes_cluster_deployment_target":           resourceKubernetesClusterDeploymentTarget(),

octopusdeploy_framework/framework_provider.go

@@ -126,6 +126,7 @@ func (p *octopusDeployFrameworkProvider) Resources(ctx context.Context) []func()
 		NewScriptModuleResource,
 		NewUserResource,
 		NewServiceAccountOIDCIdentity,
+		NewGenericOidcResource,
 	}
 }