Skip to content

Commit

Permalink
Release/2.0.1 (#101)
Browse files Browse the repository at this point in the history
* Generate openapi.yaml: Re-add CLUSTER_TYPE_HYBRID support
* Generate provider
* Update CHANGELOG
  • Loading branch information
mheap authored Nov 11, 2024
1 parent 46abee6 commit 3aa59d8
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .speakeasy/gen.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
lockVersion: 2.0.0
id: 9d20c53e-7836-4ea8-88b8-a75fb7dce3a2
management:
docChecksum: 7ba7503ae7fbac21a62fd2338c570629
docChecksum: 9a531b77d13c807727dc294c3ec22a10
docVersion: 2.0.0
speakeasyVersion: 1.430.0
generationVersion: 2.449.0
releaseVersion: 2.0.0
configChecksum: ef1448e1b6640b248cedc81e44fb8a6d
releaseVersion: 2.0.1
configChecksum: 76182f5ba79f472b48e7a7b149668879
features:
terraform:
additionalDependencies: 0.1.0
Expand Down
8 changes: 4 additions & 4 deletions .speakeasy/workflow.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ speakeasyVersion: 1.430.0
sources:
kong:
sourceNamespace: kong
sourceRevisionDigest: sha256:ee715b82a58b23752a3e6dcb66c6e94880a9bb5042fd99b8492ba55f9f9fb596
sourceBlobDigest: sha256:94eeafdddf4d22b09b01b2bf8673e5b6ebbd026f5e349371831eff1d29164fec
sourceRevisionDigest: sha256:cfa69dcbf62acfcc6611041325238e835c1cfab3096b8507f72475e461fd7034
sourceBlobDigest: sha256:42ad154bc63dbacfcca1953464e8b7b9816b4a8388d6de53a36f2b3442fd304d
tags:
- latest
targets:
terraform:
source: kong
sourceNamespace: kong
sourceRevisionDigest: sha256:ee715b82a58b23752a3e6dcb66c6e94880a9bb5042fd99b8492ba55f9f9fb596
sourceBlobDigest: sha256:94eeafdddf4d22b09b01b2bf8673e5b6ebbd026f5e349371831eff1d29164fec
sourceRevisionDigest: sha256:cfa69dcbf62acfcc6611041325238e835c1cfab3096b8507f72475e461fd7034
sourceBlobDigest: sha256:42ad154bc63dbacfcca1953464e8b7b9816b4a8388d6de53a36f2b3442fd304d
workflow:
workflowVersion: 1.0.0
speakeasyVersion: 1.430.0
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 2.0.1
> Released on 2024/11/11
### Bug Fixes

* Switched `CLUSTER_TYPE_HYBRID` to a deprecation rather than a hard removal as changing the `type` results in resource replacement

## 2.0.0
> Released on 2024/11/11
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ terraform {
required_providers {
konnect = {
source = "kong/konnect"
version = "2.0.0"
version = "2.0.1"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs/resources/gateway_control_plane.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resource "konnect_gateway_control_plane" "my_gatewaycontrolplane" {

- `auth_type` (String) The auth type value of the cluster associated with the Runtime Group. must be one of ["pinned_client_certs", "pki_client_certs"]
- `cloud_gateway` (Boolean) Whether this control-plane can be used for cloud-gateways. Requires replacement if changed.
- `cluster_type` (String) The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS"]; Requires replacement if changed.
- `cluster_type` (String) The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS", "CLUSTER_TYPE_HYBRID"]; Requires replacement if changed.
- `description` (String) The description of the control plane in Konnect.
- `labels` (Map of String) Labels store metadata of an entity that can be used for filtering an entity list or for searching across entity types.

Expand Down Expand Up @@ -72,7 +72,7 @@ Read-Only:

- `auth_type` (String) The auth type value of the cluster associated with the Runtime Group. must be one of ["pinned_client_certs", "pki_client_certs"]
- `cloud_gateway` (Boolean) Whether the Control Plane can be used for cloud-gateways.
- `cluster_type` (String) The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS"]
- `cluster_type` (String) The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS", "CLUSTER_TYPE_HYBRID"]
- `control_plane_endpoint` (String) Control Plane Endpoint.
- `proxy_urls` (Attributes Set) Array of proxy URLs associated with reaching the data-planes connected to a control-plane. (see [below for nested schema](#nestedatt--config--proxy_urls))
- `telemetry_endpoint` (String) Telemetry Endpoint.
Expand Down
2 changes: 1 addition & 1 deletion gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ generation:
oAuth2PasswordEnabled: false
baseServerURL: ""
terraform:
version: 2.0.0
version: 2.0.1
additionalDataSources: []
additionalDependencies: {}
additionalResources:
Expand Down
6 changes: 4 additions & 2 deletions internal/provider/gatewaycontrolplane_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@ func (r *GatewayControlPlaneResource) Schema(ctx context.Context, req resource.S
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplaceIfConfigured(),
},
Description: `The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS"]; Requires replacement if changed.`,
Description: `The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS", "CLUSTER_TYPE_HYBRID"]; Requires replacement if changed.`,
Validators: []validator.String{
stringvalidator.OneOf(
"CLUSTER_TYPE_CONTROL_PLANE",
"CLUSTER_TYPE_K8S_INGRESS_CONTROLLER",
"CLUSTER_TYPE_CONTROL_PLANE_GROUP",
"CLUSTER_TYPE_SERVERLESS",
"CLUSTER_TYPE_HYBRID",
),
},
},
Expand All @@ -106,13 +107,14 @@ func (r *GatewayControlPlaneResource) Schema(ctx context.Context, req resource.S
},
"cluster_type": schema.StringAttribute{
Computed: true,
Description: `The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS"]`,
Description: `The ClusterType value of the cluster associated with the Control Plane. must be one of ["CLUSTER_TYPE_CONTROL_PLANE", "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER", "CLUSTER_TYPE_CONTROL_PLANE_GROUP", "CLUSTER_TYPE_SERVERLESS", "CLUSTER_TYPE_HYBRID"]`,
Validators: []validator.String{
stringvalidator.OneOf(
"CLUSTER_TYPE_CONTROL_PLANE",
"CLUSTER_TYPE_K8S_INGRESS_CONTROLLER",
"CLUSTER_TYPE_CONTROL_PLANE_GROUP",
"CLUSTER_TYPE_SERVERLESS",
"CLUSTER_TYPE_HYBRID",
),
},
},
Expand Down
1 change: 1 addition & 0 deletions internal/sdk/konnect.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ type Konnect struct {
//
//
//
//
// <br>
// A route can't have both `tls` and `tls_passthrough` protocols at same time.
// <br><br>
Expand Down
3 changes: 3 additions & 0 deletions internal/sdk/models/shared/controlplane.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const (
ControlPlaneClusterTypeClusterTypeK8SIngressController ControlPlaneClusterType = "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER"
ControlPlaneClusterTypeClusterTypeControlPlaneGroup ControlPlaneClusterType = "CLUSTER_TYPE_CONTROL_PLANE_GROUP"
ControlPlaneClusterTypeClusterTypeServerless ControlPlaneClusterType = "CLUSTER_TYPE_SERVERLESS"
ControlPlaneClusterTypeClusterTypeHybrid ControlPlaneClusterType = "CLUSTER_TYPE_HYBRID"
)

func (e ControlPlaneClusterType) ToPointer() *ControlPlaneClusterType {
Expand All @@ -35,6 +36,8 @@ func (e *ControlPlaneClusterType) UnmarshalJSON(data []byte) error {
case "CLUSTER_TYPE_CONTROL_PLANE_GROUP":
fallthrough
case "CLUSTER_TYPE_SERVERLESS":
fallthrough
case "CLUSTER_TYPE_HYBRID":
*e = ControlPlaneClusterType(v)
return nil
default:
Expand Down
3 changes: 3 additions & 0 deletions internal/sdk/models/shared/createcontrolplanerequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const (
ClusterTypeClusterTypeK8SIngressController ClusterType = "CLUSTER_TYPE_K8S_INGRESS_CONTROLLER"
ClusterTypeClusterTypeControlPlaneGroup ClusterType = "CLUSTER_TYPE_CONTROL_PLANE_GROUP"
ClusterTypeClusterTypeServerless ClusterType = "CLUSTER_TYPE_SERVERLESS"
ClusterTypeClusterTypeHybrid ClusterType = "CLUSTER_TYPE_HYBRID"
)

func (e ClusterType) ToPointer() *ClusterType {
Expand All @@ -33,6 +34,8 @@ func (e *ClusterType) UnmarshalJSON(data []byte) error {
case "CLUSTER_TYPE_CONTROL_PLANE_GROUP":
fallthrough
case "CLUSTER_TYPE_SERVERLESS":
fallthrough
case "CLUSTER_TYPE_HYBRID":
*e = ClusterType(v)
return nil
default:
Expand Down
3 changes: 3 additions & 0 deletions openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10210,6 +10210,7 @@ components:
- CLUSTER_TYPE_K8S_INGRESS_CONTROLLER
- CLUSTER_TYPE_CONTROL_PLANE_GROUP
- CLUSTER_TYPE_SERVERLESS
- CLUSTER_TYPE_HYBRID
auth_type:
description: The auth type value of the cluster associated with the Runtime Group.
type: string
Expand Down Expand Up @@ -10302,6 +10303,7 @@ components:
- CLUSTER_TYPE_K8S_INGRESS_CONTROLLER
- CLUSTER_TYPE_CONTROL_PLANE_GROUP
- CLUSTER_TYPE_SERVERLESS
- CLUSTER_TYPE_HYBRID
readOnly: true
auth_type:
description: The auth type value of the cluster associated with the Runtime Group.
Expand Down Expand Up @@ -26413,6 +26415,7 @@ tags:




<br>
A route can't have both `tls` and `tls_passthrough` protocols at same time.
<br><br>
Expand Down

0 comments on commit 3aa59d8

Please sign in to comment.