|
|
@@ -11,6 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
See the License for the specific language governing permissions and
|
|
|
limitations under the License.
|
|
|
*/
|
|
|
+
|
|
|
package framework
|
|
|
|
|
|
import (
|
|
|
@@ -31,13 +32,16 @@ var TargetSecretName = "target-secret"
|
|
|
|
|
|
// TestCase contains the test infra to run a table driven test.
|
|
|
type TestCase struct {
|
|
|
- Framework *Framework
|
|
|
- ExternalSecret *esv1beta1.ExternalSecret
|
|
|
- ExternalSecretV1Alpha1 *esv1alpha1.ExternalSecret
|
|
|
- AdditionalObjects []client.Object
|
|
|
- Secrets map[string]SecretEntry
|
|
|
- ExpectedSecret *v1.Secret
|
|
|
- AfterSync func(SecretStoreProvider, *v1.Secret)
|
|
|
+ Framework *Framework
|
|
|
+ ExternalSecret *esv1beta1.ExternalSecret
|
|
|
+ ExternalSecretV1Alpha1 *esv1alpha1.ExternalSecret
|
|
|
+ PushSecret *esv1alpha1.PushSecret
|
|
|
+ PushSecretSource *v1.Secret
|
|
|
+ AdditionalObjects []client.Object
|
|
|
+ Secrets map[string]SecretEntry
|
|
|
+ ExpectedSecret *v1.Secret
|
|
|
+ AfterSync func(SecretStoreProvider, *v1.Secret)
|
|
|
+ VerifyPushSecretOutcome func(ps *esv1alpha1.PushSecret, pushClient esv1beta1.SecretsClient)
|
|
|
}
|
|
|
|
|
|
type SecretEntry struct {
|
|
|
@@ -52,64 +56,114 @@ type SecretStoreProvider interface {
|
|
|
DeleteSecret(key string)
|
|
|
}
|
|
|
|
|
|
-// TableFunc returns the main func that runs a TestCase in a table driven test.
|
|
|
-func TableFunc(f *Framework, prov SecretStoreProvider) func(...func(*TestCase)) {
|
|
|
+// TableFuncWithExternalSecret returns the main func that runs a TestCase in a table driven test.
|
|
|
+func TableFuncWithExternalSecret(f *Framework, prov SecretStoreProvider) func(...func(*TestCase)) {
|
|
|
return func(tweaks ...func(*TestCase)) {
|
|
|
- var err error
|
|
|
-
|
|
|
// make default test case
|
|
|
// and apply customization to it
|
|
|
- tc := makeDefaultTestCase(f)
|
|
|
+ tc := makeDefaultExternalSecretTestCase(f)
|
|
|
for _, tweak := range tweaks {
|
|
|
tweak(tc)
|
|
|
}
|
|
|
|
|
|
// create secrets & defer delete
|
|
|
+ var deferRemoveKeys []string
|
|
|
for k, v := range tc.Secrets {
|
|
|
key := k
|
|
|
prov.CreateSecret(key, v)
|
|
|
- defer func() {
|
|
|
- prov.DeleteSecret(key)
|
|
|
- }()
|
|
|
+ deferRemoveKeys = append(deferRemoveKeys, key)
|
|
|
}
|
|
|
|
|
|
- // create v1alpha1 external secret, if provided
|
|
|
- if tc.ExternalSecretV1Alpha1 != nil {
|
|
|
- err = tc.Framework.CRClient.Create(context.Background(), tc.ExternalSecretV1Alpha1)
|
|
|
- Expect(err).ToNot(HaveOccurred())
|
|
|
- } else if tc.ExternalSecret != nil {
|
|
|
- // create v1beta1 external secret otherwise
|
|
|
- err = tc.Framework.CRClient.Create(context.Background(), tc.ExternalSecret)
|
|
|
- Expect(err).ToNot(HaveOccurred())
|
|
|
- }
|
|
|
- if tc.AdditionalObjects != nil {
|
|
|
- for _, obj := range tc.AdditionalObjects {
|
|
|
- err = tc.Framework.CRClient.Create(context.Background(), obj)
|
|
|
- Expect(err).ToNot(HaveOccurred())
|
|
|
+ defer func() {
|
|
|
+ for _, k := range deferRemoveKeys {
|
|
|
+ prov.DeleteSecret(k)
|
|
|
}
|
|
|
- }
|
|
|
+ }()
|
|
|
+
|
|
|
+ // create v1alpha1 external secret, if provided
|
|
|
+ createProvidedExternalSecret(tc)
|
|
|
+
|
|
|
+ // create additional objects
|
|
|
+ generateAdditionalObjects(tc)
|
|
|
+
|
|
|
// in case target name is empty
|
|
|
if tc.ExternalSecret != nil && tc.ExternalSecret.Spec.Target.Name == "" {
|
|
|
TargetSecretName = tc.ExternalSecret.ObjectMeta.Name
|
|
|
}
|
|
|
|
|
|
// wait for Kind=Secret to have the expected data
|
|
|
- if tc.ExpectedSecret != nil {
|
|
|
- secret, err := tc.Framework.WaitForSecretValue(tc.Framework.Namespace.Name, TargetSecretName, tc.ExpectedSecret)
|
|
|
- if err != nil {
|
|
|
- f.printESDebugLogs(tc.ExternalSecret.Name, tc.ExternalSecret.Namespace)
|
|
|
- log.Logf("Did not match. Expected: %+v, Got: %+v", tc.ExpectedSecret, secret)
|
|
|
- }
|
|
|
+ executeAfterSync(tc, f, prov)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func executeAfterSync(tc *TestCase, f *Framework, prov SecretStoreProvider) {
|
|
|
+ if tc.ExpectedSecret != nil {
|
|
|
+ secret, err := tc.Framework.WaitForSecretValue(tc.Framework.Namespace.Name, TargetSecretName, tc.ExpectedSecret)
|
|
|
+ if err != nil {
|
|
|
+ f.printESDebugLogs(tc.ExternalSecret.Name, tc.ExternalSecret.Namespace)
|
|
|
+ log.Logf("Did not match. Expected: %+v, Got: %+v", tc.ExpectedSecret, secret)
|
|
|
+ }
|
|
|
+
|
|
|
+ Expect(err).ToNot(HaveOccurred())
|
|
|
+ tc.AfterSync(prov, secret)
|
|
|
+ } else {
|
|
|
+ tc.AfterSync(prov, nil)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func generateAdditionalObjects(tc *TestCase) {
|
|
|
+ if tc.AdditionalObjects != nil {
|
|
|
+ for _, obj := range tc.AdditionalObjects {
|
|
|
+ err := tc.Framework.CRClient.Create(context.Background(), obj)
|
|
|
+ Expect(err).ToNot(HaveOccurred())
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+func createProvidedExternalSecret(tc *TestCase) {
|
|
|
+ if tc.ExternalSecretV1Alpha1 != nil {
|
|
|
+ err := tc.Framework.CRClient.Create(context.Background(), tc.ExternalSecretV1Alpha1)
|
|
|
+ Expect(err).ToNot(HaveOccurred())
|
|
|
+ } else if tc.ExternalSecret != nil {
|
|
|
+ // create v1beta1 external secret otherwise
|
|
|
+ err := tc.Framework.CRClient.Create(context.Background(), tc.ExternalSecret)
|
|
|
+ Expect(err).ToNot(HaveOccurred())
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+// TableFuncWithPushSecret returns the main func that runs a TestCase in a table driven test for push secrets.
|
|
|
+func TableFuncWithPushSecret(f *Framework, prov SecretStoreProvider, pushClient esv1beta1.SecretsClient) func(...func(*TestCase)) {
|
|
|
+ return func(tweaks ...func(*TestCase)) {
|
|
|
+ var err error
|
|
|
+
|
|
|
+ // make default test case
|
|
|
+ // and apply customization to it
|
|
|
+ tc := makeDefaultPushSecretTestCase(f)
|
|
|
+ for _, tweak := range tweaks {
|
|
|
+ tweak(tc)
|
|
|
+ }
|
|
|
|
|
|
+ if tc.PushSecretSource != nil {
|
|
|
+ err := tc.Framework.CRClient.Create(context.Background(), tc.PushSecretSource)
|
|
|
+ Expect(err).ToNot(HaveOccurred())
|
|
|
+ }
|
|
|
+
|
|
|
+ // create v1alpha1 push secret, if provided
|
|
|
+ if tc.PushSecret != nil {
|
|
|
+ // create v1beta1 external secret otherwise
|
|
|
+ err = tc.Framework.CRClient.Create(context.Background(), tc.PushSecret)
|
|
|
Expect(err).ToNot(HaveOccurred())
|
|
|
- tc.AfterSync(prov, secret)
|
|
|
- } else {
|
|
|
- tc.AfterSync(prov, nil)
|
|
|
}
|
|
|
+
|
|
|
+ // additional objects
|
|
|
+ generateAdditionalObjects(tc)
|
|
|
+
|
|
|
+ // Run verification on the secret that push secret created or not.
|
|
|
+ tc.VerifyPushSecretOutcome(tc.PushSecret, pushClient)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func makeDefaultTestCase(f *Framework) *TestCase {
|
|
|
+func makeDefaultExternalSecretTestCase(f *Framework) *TestCase {
|
|
|
return &TestCase{
|
|
|
AfterSync: func(ssp SecretStoreProvider, s *v1.Secret) {},
|
|
|
Framework: f,
|
|
|
@@ -130,3 +184,23 @@ func makeDefaultTestCase(f *Framework) *TestCase {
|
|
|
},
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+func makeDefaultPushSecretTestCase(f *Framework) *TestCase {
|
|
|
+ return &TestCase{
|
|
|
+ Framework: f,
|
|
|
+ PushSecret: &esv1alpha1.PushSecret{
|
|
|
+ ObjectMeta: metav1.ObjectMeta{
|
|
|
+ Name: "e2e-ps",
|
|
|
+ Namespace: f.Namespace.Name,
|
|
|
+ },
|
|
|
+ Spec: esv1alpha1.PushSecretSpec{
|
|
|
+ RefreshInterval: &metav1.Duration{Duration: time.Second * 5},
|
|
|
+ SecretStoreRefs: []esv1alpha1.PushSecretStoreRef{
|
|
|
+ {
|
|
|
+ Name: f.Namespace.Name,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+ }
|
|
|
+}
|