Skip to content

Commit d8885de

Browse files
thevilledevthevilledev
authored
chore(lint): remove unused code (#2161)
* chore(lint): remove unused code * func referenced by commented out code
1 parent 00db9d2 commit d8885de

12 files changed

+3
-476
lines changed

‎kubernetes/resource_kubernetes_config_map_test.go‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -307,23 +307,6 @@ func testAccCheckKubernetesConfigMapExists(n string, obj *api.ConfigMap) resourc
307307
}
308308
}
309309

310-
func deleteConfigMap(t *testing.T, obj *api.ConfigMap) {
311-
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
312-
if err != nil {
313-
t.Error(err)
314-
return
315-
}
316-
317-
ctx := context.TODO()
318-
err = conn.CoreV1().ConfigMaps(
319-
obj.ObjectMeta.GetNamespace()).Delete(
320-
ctx, obj.ObjectMeta.GetName(), metav1.DeleteOptions{})
321-
if err != nil {
322-
t.Error(err)
323-
return
324-
}
325-
}
326-
327310
func testAccKubernetesConfigMapConfig_nodata(name string) string {
328311
return fmt.Sprintf(`resource "kubernetes_config_map" "test" {
329312
metadata {

‎kubernetes/resource_kubernetes_daemonset_test.go‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -387,21 +387,6 @@ func TestAccKubernetesDaemonSet_with_resource_requirements(t *testing.T) {
387387
})
388388
}
389389

390-
func testAccCheckKubernetesDaemonsetForceNew(old, new *appsv1.DaemonSet, wantNew bool) resource.TestCheckFunc {
391-
return func(s *terraform.State) error {
392-
if wantNew {
393-
if old.ObjectMeta.UID == new.ObjectMeta.UID {
394-
return fmt.Errorf("Expecting new resource for daemonset %s", old.ObjectMeta.UID)
395-
}
396-
} else {
397-
if old.ObjectMeta.UID != new.ObjectMeta.UID {
398-
return fmt.Errorf("Expecting daemonset UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
399-
}
400-
}
401-
return nil
402-
}
403-
}
404-
405390
func testAccCheckKubernetesDaemonSetDestroy(s *terraform.State) error {
406391
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
407392

‎kubernetes/resource_kubernetes_deployment_test.go‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2807,93 +2807,6 @@ func testAccKubernetesDeploymentConfigWithAutomountServiceAccountToken(deploymen
28072807
`, deploymentName, imageName)
28082808
}
28092809

2810-
func testAccKubernetesDeploymentConfigLocal(provider, name, imageName string) string {
2811-
return fmt.Sprintf(`resource "kubernetes_deployment" "test" {
2812-
provider = %s
2813-
metadata {
2814-
annotations = {
2815-
TestAnnotationOne = "one"
2816-
TestAnnotationTwo = "two"
2817-
}
2818-
2819-
labels = {
2820-
TestLabelOne = "one"
2821-
TestLabelTwo = "two"
2822-
TestLabelThree = "three"
2823-
}
2824-
2825-
name = "%s"
2826-
}
2827-
2828-
spec {
2829-
replicas = 5
2830-
2831-
selector {
2832-
match_labels = {
2833-
TestLabelOne = "one"
2834-
TestLabelTwo = "two"
2835-
TestLabelThree = "three"
2836-
}
2837-
}
2838-
2839-
template {
2840-
metadata {
2841-
labels = {
2842-
TestLabelOne = "one"
2843-
TestLabelTwo = "two"
2844-
TestLabelThree = "three"
2845-
}
2846-
}
2847-
2848-
spec {
2849-
container {
2850-
image = %q
2851-
name = "containername"
2852-
2853-
port {
2854-
container_port = 80
2855-
}
2856-
2857-
readiness_probe {
2858-
initial_delay_seconds = 5
2859-
http_get {
2860-
path = "/"
2861-
port = 80
2862-
}
2863-
}
2864-
2865-
resources {
2866-
requests = {
2867-
memory = "64Mi"
2868-
cpu = "50m"
2869-
}
2870-
}
2871-
env {
2872-
name = "LIMITS_CPU"
2873-
value_from {
2874-
resource_field_ref {
2875-
container_name = "containername"
2876-
resource = "requests.cpu"
2877-
}
2878-
}
2879-
}
2880-
env {
2881-
name = "LIMITS_MEM"
2882-
value_from {
2883-
resource_field_ref {
2884-
container_name = "containername"
2885-
resource = "requests.memory"
2886-
}
2887-
}
2888-
}
2889-
}
2890-
}
2891-
}
2892-
}
2893-
}
2894-
`, provider, name, imageName)
2895-
}
2896-
28972810
func testAccKubernetesDeploymentConfig_ForceNew(secretName, label, deploymentName, imageName string) string {
28982811
return fmt.Sprintf(`resource "kubernetes_secret" "test" {
28992812
metadata {

‎kubernetes/resource_kubernetes_persistent_volume_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,9 +1834,9 @@ func testAccKubernetesPersistentVolumeConfig_hostPath_nodeAffinity_match(name, s
18341834
return testAccKubernetesPersistentVolumeConfig_hostPath_nodeAffinity(name, nodeAffinity)
18351835
}
18361836

1837-
func testAccKubernetesPersistentVolumeConfig_hostPath_withoutNodeAffinity(name string) string {
1838-
return testAccKubernetesPersistentVolumeConfig_hostPath_nodeAffinity(name, ``)
1839-
}
1837+
//func testAccKubernetesPersistentVolumeConfig_hostPath_withoutNodeAffinity(name string) string {
1838+
// return testAccKubernetesPersistentVolumeConfig_hostPath_nodeAffinity(name, ``)
1839+
//}
18401840

18411841
func testAccKubernetesPersistentVolumeConfig_hostPath_mountOptions(name string) string {
18421842
return fmt.Sprintf(`resource "kubernetes_persistent_volume" "test" {

‎kubernetes/resource_kubernetes_service_test.go‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -791,21 +791,6 @@ func TestAccKubernetesServiceV1_ipFamilies(t *testing.T) {
791791
})
792792
}
793793

794-
func testAccCheckKubernetesServiceForceNew(old, new *api.Service, wantNew bool) resource.TestCheckFunc {
795-
return func(s *terraform.State) error {
796-
if wantNew {
797-
if old.ObjectMeta.UID == new.ObjectMeta.UID {
798-
return fmt.Errorf("Expecting new resource for Service %s", old.ObjectMeta.UID)
799-
}
800-
} else {
801-
if old.ObjectMeta.UID != new.ObjectMeta.UID {
802-
return fmt.Errorf("Expecting Service UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
803-
}
804-
}
805-
return nil
806-
}
807-
}
808-
809794
func testAccCheckServicePorts(svc *api.Service, expected []api.ServicePort) resource.TestCheckFunc {
810795
return func(s *terraform.State) error {
811796
if len(expected) == 0 && len(svc.Spec.Ports) == 0 {
@@ -937,24 +922,6 @@ func testAccKubernetesServiceConfig_basic(name string) string {
937922
`, name)
938923
}
939924

940-
func testAccKubernetesServiceConfig_stateUpgradev0(provider, name string) string {
941-
return fmt.Sprintf(`resource "kubernetes_service" "test" {
942-
provider = "%s"
943-
metadata {
944-
name = "%s"
945-
}
946-
947-
spec {
948-
type = "LoadBalancer"
949-
port {
950-
port = 8080
951-
target_port = 80
952-
}
953-
}
954-
}
955-
`, provider, name)
956-
}
957-
958925
func testAccKubernetesServiceConfig_modified(name string) string {
959926
return fmt.Sprintf(`resource "kubernetes_service" "test" {
960927
metadata {

‎kubernetes/resource_kubernetes_validating_webhook_configuration_test.go‎

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
14-
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
15-
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
1614
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1715

1816
"k8s.io/apimachinery/pkg/api/errors"
@@ -188,70 +186,6 @@ func testAccCheckKubernetesValidatingWebhookConfigurationExists(n string) resour
188186
}
189187
}
190188

191-
func testAccCheckKubernetesValidatingWebhookGetObjectV1(n string, obj *admissionregistrationv1.ValidatingWebhookConfiguration) resource.TestCheckFunc {
192-
return func(s *terraform.State) error {
193-
rs, ok := s.RootModule().Resources[n]
194-
if !ok {
195-
return fmt.Errorf("Not found: %s", n)
196-
}
197-
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
198-
if err != nil {
199-
return err
200-
}
201-
ctx := context.TODO()
202-
name := rs.Primary.ID
203-
obj, err = conn.AdmissionregistrationV1().ValidatingWebhookConfigurations().Get(ctx, name, metav1.GetOptions{})
204-
return nil
205-
}
206-
}
207-
208-
func testAccCheckKubernetesValidatingWebhookGetObjectV1Beta1(n string, obj *admissionregistrationv1beta1.ValidatingWebhookConfiguration) resource.TestCheckFunc {
209-
return func(s *terraform.State) error {
210-
rs, ok := s.RootModule().Resources[n]
211-
if !ok {
212-
return fmt.Errorf("Not found: %s", n)
213-
}
214-
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
215-
if err != nil {
216-
return err
217-
}
218-
ctx := context.TODO()
219-
name := rs.Primary.ID
220-
obj, err = conn.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Get(ctx, name, metav1.GetOptions{})
221-
return nil
222-
}
223-
}
224-
225-
func testAccCheckKubernetesValidatingWebhookConfigV1ForceNew(old, new *admissionregistrationv1.ValidatingWebhookConfiguration, wantNew bool) resource.TestCheckFunc {
226-
return func(s *terraform.State) error {
227-
if wantNew {
228-
if old.ObjectMeta.UID == new.ObjectMeta.UID {
229-
return fmt.Errorf("Expecting new resource for ValidatingWebhookConfiguration %s", old.ObjectMeta.UID)
230-
}
231-
} else {
232-
if old.ObjectMeta.UID != new.ObjectMeta.UID {
233-
return fmt.Errorf("Expecting ValidatingWebhookConfiguration UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
234-
}
235-
}
236-
return nil
237-
}
238-
}
239-
240-
func testAccCheckKubernetesValidatingWebhookConfigV1Beta1ForceNew(old, new *admissionregistrationv1beta1.ValidatingWebhookConfiguration, wantNew bool) resource.TestCheckFunc {
241-
return func(s *terraform.State) error {
242-
if wantNew {
243-
if old.ObjectMeta.UID == new.ObjectMeta.UID {
244-
return fmt.Errorf("Expecting new resource for ValidatingWebhookConfiguration %s", old.ObjectMeta.UID)
245-
}
246-
} else {
247-
if old.ObjectMeta.UID != new.ObjectMeta.UID {
248-
return fmt.Errorf("Expecting ValidatingWebhookConfiguration UIDs to be the same: expected %s got %s", old.ObjectMeta.UID, new.ObjectMeta.UID)
249-
}
250-
}
251-
return nil
252-
}
253-
}
254-
255189
func testAccKubernetesValidatingWebhookConfigurationConfig_basic(name string) string {
256190
return fmt.Sprintf(`
257191
resource "kubernetes_validating_webhook_configuration" "test" {
@@ -345,60 +279,6 @@ resource "kubernetes_validating_webhook_configuration" "test" {
345279
`, name, name)
346280
}
347281

348-
func testAccKubernetesValidatingWebhookConfigurationConfig_without_rules(name string) string {
349-
return fmt.Sprintf(`
350-
resource "kubernetes_validating_webhook_configuration_v1" "test" {
351-
metadata {
352-
name = %q
353-
}
354-
355-
webhook {
356-
name = %q
357-
358-
failure_policy = "Ignore"
359-
match_policy = "Exact"
360-
361-
admission_review_versions = [
362-
"v1",
363-
"v1beta1"
364-
]
365-
366-
client_config {
367-
service {
368-
namespace = "example-namespace"
369-
name = "example-service"
370-
}
371-
372-
ca_bundle = "test"
373-
}
374-
375-
object_selector {
376-
match_labels = {
377-
app = "test"
378-
}
379-
}
380-
381-
side_effects = "NoneOnDryRun"
382-
timeout_seconds = 5
383-
}
384-
}
385-
`, name, name)
386-
}
387-
388-
func skipIfNotAdmissionRegistrationV1Beta1(t *testing.T) {
389-
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
390-
if err != nil {
391-
t.Fatal(err)
392-
}
393-
useadmissionregistrationv1beta1, err := useAdmissionregistrationV1beta1(conn)
394-
if err != nil {
395-
t.Fatal(err)
396-
}
397-
if !useadmissionregistrationv1beta1 {
398-
t.Skip("The Kubernetes endpoint is not using admissionregistrationv1beta1 - skipping.")
399-
}
400-
}
401-
402282
func skipIfNotAdmissionRegistrationV1(t *testing.T) {
403283
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
404284
if err != nil {

‎kubernetes/schema_endpointslice.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,3 @@ func schemaObjectReference() *schema.Resource {
151151
},
152152
}
153153
}
154-
155-
func hashEndpointSlicePorts() schema.SchemaSetFunc {
156-
return schema.HashResource(schemaEndpointSliceSubsetPorts())
157-
}
158-
159-
func hashEndpointSliceEndpoints() schema.SchemaSetFunc {
160-
return schema.HashResource(schemaEndpointSliceSubsetEndpoints())
161-
}

‎kubernetes/structure_ingress_spec.go‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package kubernetes
55

66
import (
7-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
87
"k8s.io/api/extensions/v1beta1"
98
"k8s.io/apimachinery/pkg/util/intstr"
109
)
@@ -200,31 +199,3 @@ func expandIngressTLS(l []interface{}) []v1beta1.IngressTLS {
200199

201200
return tlsList
202201
}
203-
204-
// Patch Ops
205-
206-
func patchIngressSpec(keyPrefix, pathPrefix string, d *schema.ResourceData) PatchOperations {
207-
ops := make([]PatchOperation, 0)
208-
if d.HasChange(keyPrefix + "backend") {
209-
ops = append(ops, &ReplaceOperation{
210-
Path: pathPrefix + "backend",
211-
Value: expandIngressBackend(d.Get(keyPrefix + "backend").([]interface{})),
212-
})
213-
}
214-
215-
if d.HasChange(keyPrefix + "rule") {
216-
ops = append(ops, &ReplaceOperation{
217-
Path: pathPrefix + "rules",
218-
Value: expandIngressRule(d.Get(keyPrefix + "rule").([]interface{})),
219-
})
220-
}
221-
222-
if d.HasChange(keyPrefix + "tls") {
223-
ops = append(ops, &ReplaceOperation{
224-
Path: pathPrefix + "tls",
225-
Value: expandIngressTLS(d.Get(keyPrefix + "tls").([]interface{})),
226-
})
227-
}
228-
229-
return ops
230-
}

0 commit comments

Comments
 (0)