github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing tests

Browse Source
This commit is contained in:
Diamon Wiggins
2022-09-13 23:27:49 -04:00
parent e53871b4dc
commit ec6ec59303
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/specs/secrets.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/pkg/errors"
"github.com/replicatedhq/troubleshoot/pkg/k8sutil"
"github.com/replicatedhq/troubleshoot/pkg/logger"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
)
@@ -38,13 +39,14 @@ func LoadFromSecretMatchingLabel(client kubernetes.Interface, labelSelector stri
secrets, err := client.CoreV1().Secrets(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector})
if err != nil {
return nil, errors.Wrap(err, "failed to get secret")
return nil, errors.Wrap(err, "failed to search for secrets containing support bundles in the cluster")
}
for _, secret := range secrets.Items {
spec, ok := secret.StringData[key]
spec, ok := secret.Data[key]
if !ok {
return nil, errors.Errorf("support bundle spec not found in secret with matching label %s", secret.Name)
logger.Printf("expected key of %s not found in secret %s, skipping\n", key, secret.Name)
continue
}
secretsMatchingKey = append(secretsMatchingKey, string(spec))
}

66
pkg/specs/secrets_test.go
View File

@@ -34,8 +34,8 @@ func Test_LoadFromSecretMatchingLabel(t *testing.T) {
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: test
@@ -49,7 +49,7 @@ spec:
- name: run-ping
image: busybox:1
command: ["ping"]
args: ["-w", "5", "www.google.com"]`,
args: ["-w", "5", "www.google.com"]`),
},
},
},
@@ -79,8 +79,8 @@ spec:
Name: "secret",
Namespace: "default",
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: test
@@ -89,7 +89,7 @@ spec:
- data:
name: static/data.txt
data: |
static data`,
static data`),
},
},
},
@@ -103,8 +103,8 @@ spec:
Name: "secret",
Namespace: "default",
},
StringData: map[string]string{
"support-bundle-specc": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-specc": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: test
@@ -113,7 +113,7 @@ spec:
- data:
name: static/data.txt
data: |
static data`,
static data`),
},
},
},
@@ -130,14 +130,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-info
spec:
collectors:
- clusterInfo: {}`,
- clusterInfo: {}`),
},
},
{
@@ -148,14 +148,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-resources
spec:
collectors:
- clusterResources: {}`,
- clusterResources: {}`),
},
},
},
@@ -187,14 +187,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-info
spec:
collectors:
- clusterInfo: {}`,
- clusterInfo: {}`),
},
},
{
@@ -205,14 +205,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-resources
spec:
collectors:
- clusterResources: {}`,
- clusterResources: {}`),
},
},
},
@@ -244,14 +244,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec-wrong",
},
},
StringData: map[string]string{
"support-bundle-spec-wrong": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec-wrong": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-info
spec:
collectors:
- clusterInfo: {}`,
- clusterInfo: {}`),
},
},
{
@@ -262,14 +262,14 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: cluster-resources
spec:
collectors:
- clusterResources: {}`,
- clusterResources: {}`),
},
},
},
@@ -325,8 +325,8 @@ func TestUserProvidedNamespace_LoadFromSecretMatchingLabel(t *testing.T) {
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: test
@@ -335,7 +335,7 @@ spec:
- data:
name: static/data.txt
data: |
static data`,
static data`),
},
},
},
@@ -363,8 +363,8 @@ spec:
"troubleshoot.io/kind": "supportbundle-spec",
},
},
StringData: map[string]string{
"support-bundle-spec": `apiVersion: troubleshoot.sh/v1beta2
Data: map[string][]byte{
"support-bundle-spec": []byte(`apiVersion: troubleshoot.sh/v1beta2
kind: SupportBundle
metadata:
name: test
@@ -373,7 +373,7 @@ spec:
- data:
name: static/data.txt
data: |
static data`,
static data`),
},
},
},