Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not remove server side fields for datasources #1802

Merged
merged 3 commits into from
Nov 3, 2022
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 .changelog/1802.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
The kubernetes status field is now available in the `kubernetes_resource` datasource
```
5 changes: 2 additions & 3 deletions manifest/provider/datasource.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (s *RawProviderServer) ReadDataSource(ctx context.Context, req *tfprotov5.R
}
rcl := client.Resource(gvr)

objectType, th, err := s.TFTypeFromOpenAPI(ctx, gvk, false)
objectType, th, err := s.TFTypeFromOpenAPI(ctx, gvk, true)
if err != nil {
resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
Severity: tfprotov5.DiagnosticSeverityError,
Expand Down Expand Up @@ -148,8 +148,7 @@ func (s *RawProviderServer) ReadDataSource(ctx context.Context, req *tfprotov5.R
return resp, nil
}

fo := RemoveServerSideFields(res.Object)
nobj, err := payload.ToTFValue(fo, objectType, th, tftypes.NewAttributePath())
nobj, err := payload.ToTFValue(res.Object, objectType, th, tftypes.NewAttributePath())
if err != nil {
resp.Diagnostics = append(resp.Diagnostics, &tfprotov5.Diagnostic{
Severity: tfprotov5.DiagnosticSeverityError,
Expand Down
83 changes: 83 additions & 0 deletions manifest/test/acceptance/datasource_resource_status_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
//go:build acceptance
// +build acceptance

package acceptance

import (
"context"
"testing"

"github.com/hashicorp/go-hclog"
"github.com/hashicorp/terraform-provider-kubernetes/manifest/provider"
"github.com/hashicorp/terraform-provider-kubernetes/manifest/test/helper/kubernetes"

tfstatehelper "github.com/hashicorp/terraform-provider-kubernetes/manifest/test/helper/state"
)

func TestDataSourceKubernetesResourceStatus_Deployment(t *testing.T) {
ctx := context.Background()

reattachInfo, err := provider.ServeTest(ctx, hclog.Default(), t)
if err != nil {
t.Errorf("Failed to create provider instance: %q", err)
}

name := randName()
namespace := randName()

k8shelper.CreateNamespace(t, namespace)
defer k8shelper.DeleteResource(t, namespace, kubernetes.NewGroupVersionResource("v1", "namespaces"))

// STEP 1: Create a Deployment to use as a data source
tf := tfhelper.RequireNewWorkingDir(ctx, t)
tf.SetReattachInfo(ctx, reattachInfo)
defer func() {
tf.Destroy(ctx)
tf.Close()
k8shelper.AssertNamespacedResourceDoesNotExist(t, "apps/v1", "deployments", namespace, name)
}()

tfvars := TFVARS{
"name": name,
"namespace": namespace,
}
tfconfig := loadTerraformConfig(t, "datasource-resource-status/step1.tf", tfvars)
tf.SetConfig(ctx, tfconfig)
tf.Init(ctx)
tf.Apply(ctx)

k8shelper.AssertNamespacedResourceExists(t, "apps/v1", "deployments", namespace, name)

state, err := tf.State(ctx)
if err != nil {
t.Fatalf("Failed to retrieve terraform state: %q", err)
}
tfstate := tfstatehelper.NewHelper(state)

// STEP 2: Read the Deployment from step 1 using a kubernetes_resource data source
reattachInfo2, err := provider.ServeTest(ctx, hclog.Default(), t)
if err != nil {
t.Errorf("Failed to create additional provider instance: %q", err)
}
step2 := tfhelper.RequireNewWorkingDir(ctx, t)
step2.SetReattachInfo(ctx, reattachInfo2)
defer func() {
step2.Destroy(ctx)
step2.Close()
k8shelper.AssertNamespacedResourceDoesNotExist(t, "apps/v1", "deployments", namespace, name)
}()

tfconfig = loadTerraformConfig(t, "datasource-resource-status/step2.tf", tfvars)
step2.SetConfig(ctx, string(tfconfig))
step2.Init(ctx)
step2.Apply(ctx)

s2, err := step2.State(ctx)
if err != nil {
t.Fatalf("Failed to retrieve terraform state: %q", err)
}
tfstate = tfstatehelper.NewHelper(s2)

// check that the data source has the status field defined
tfstate.AssertAttributeNotEmpty(t, "data.kubernetes_resource.test_deploy.object.status")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
resource "kubernetes_manifest" "test_deploy" {
manifest = {
"apiVersion" = "apps/v1"
"kind" = "Deployment"
"metadata" = {
"name" = var.name
"namespace" = var.namespace
}
"spec" = {
"selector" = {
"matchLabels" = {
"test" = "MyExampleApp"
}
}

"template" = {
"metadata" = {
"labels" = {
"test" = "MyExampleApp"
}
}

"spec" = {
"containers" = [
{
"image" = "nginx:1.21.6"
"name" = "example"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
data "kubernetes_resource" "test_deploy" {
api_version = "apps/v1"
kind = "Deployment"
metadata {
name = var.name
namespace = var.namespace
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# These variable declarations are only used for interactive testing.
# The test code will template in different variable declarations with a default value when running the test.
#
# To set values for interactive runs, create a var-file and set values in it.
# If the name of the var-file ends in '.auto.tfvars' (e.g. myvalues.auto.tfvars)
# it will be automatically picked up and used by Terraform.
#
# DO NOT check in any files named *.auto.tfvars when making changes to tests.

variable "name" {
type = string
}

variable "namespace" {
type = string
}