feat: removed secret and configmap checks for sgobjectstorages and sgscripts

Author: teoincontatto

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageReferencesValidator.java

@@ -6,25 +6,15 @@
 package io.stackgres.operator.validation.script;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.ImmutableSet;
-import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.fabric8.kubernetes.api.model.ConfigMapKeySelector;
-import io.fabric8.kubernetes.api.model.Secret;
-import io.fabric8.kubernetes.api.model.SecretKeySelector;
 import io.stackgres.common.ErrorType;
 import io.stackgres.common.crd.sgscript.StackGresScript;
 import io.stackgres.common.crd.sgscript.StackGresScriptEntry;
 import io.stackgres.common.crd.sgscript.StackGresScriptEntryStatus;
-import io.stackgres.common.crd.sgscript.StackGresScriptFrom;
 import io.stackgres.common.crd.sgscript.StackGresScriptSpec;
 import io.stackgres.common.crd.sgscript.StackGresScriptStatus;
-import io.stackgres.common.resource.ResourceFinder;
 import io.stackgres.operator.common.StackGresScriptReview;
 import io.stackgres.operator.validation.ValidationType;
 import io.stackgres.operatorframework.admissionwebhook.Operation;
@@ -39,19 +29,8 @@ public class ScriptsConfigValidator implements ScriptValidator {
   private final String constraintViolationUri = ErrorType
       .getErrorTypeUri(ErrorType.CONSTRAINT_VIOLATION);
 
-  private final String invalidReference = ErrorType
-      .getErrorTypeUri(ErrorType.INVALID_CR_REFERENCE);
-
-  private final ResourceFinder<Secret> secretFinder;
-
-  private final ResourceFinder<ConfigMap> configMapFinder;
-
   @Inject
-  public ScriptsConfigValidator(
-      ResourceFinder<Secret> secretFinder,
-      ResourceFinder<ConfigMap> configMapFinder) {
-    this.secretFinder = secretFinder;
-    this.configMapFinder = configMapFinder;
+  public ScriptsConfigValidator() {
   }
 
   @Override
@@ -68,8 +47,6 @@ public void validate(StackGresScriptReview review) throws ValidationFailed {
           .orElse(List.of());
       checkIdsUniqueness(scripts);
       checkStatusIdsCorrelation(scripts, scriptsStatuses);
-      checkSecretKeySelectors(review, scripts);
-      checkConfigMapsSelectors(review, scripts);
     }
   }
 
@@ -103,72 +80,4 @@ private void checkStatusIdsCorrelation(List<StackGresScriptEntry> scripts,
     }
   }
 
-  private void checkConfigMapsSelectors(StackGresScriptReview review,
-                                        List<StackGresScriptEntry> scripts)
-      throws ValidationFailed {
-    String clusterNamespace = review.getRequest().getObject().getMetadata().getNamespace();
-
-    List<ConfigMapKeySelector> configMapsSelectors = scripts.stream()
-        .map(StackGresScriptEntry::getScriptFrom)
-        .filter(Objects::nonNull)
-        .<ConfigMapKeySelector>map(StackGresScriptFrom::getConfigMapKeyRef)
-        .filter(Objects::nonNull)
-        .toList();
-
-    for (ConfigMapKeySelector configMapRef : configMapsSelectors) {
-      Optional<ConfigMap> scriptConfigMap = configMapFinder
-          .findByNameAndNamespace(configMapRef.getName(), clusterNamespace);
-
-      if (scriptConfigMap.isEmpty()) {
-        fail(invalidReference,
-            "Referenced ConfigMap " + configMapRef.getName()
-                + " does not exists in namespace " + clusterNamespace);
-      } else {
-        Set<String> configMapKeys = ImmutableSet.<String>builder()
-            .addAll(Optional.ofNullable(scriptConfigMap.get().getData())
-                .map(Map::keySet)
-                .orElse(Set.of()))
-            .addAll(Optional.ofNullable(scriptConfigMap.get().getBinaryData())
-                .map(Map::keySet)
-                .orElse(Set.of()))
-            .build();
-
-        if (!configMapKeys.contains(configMapRef.getKey())) {
-          fail(invalidReference, "Key " + configMapRef.getKey()
-              + " does not exists in ConfigMap " + configMapRef.getName());
-        }
-      }
-
-    }
-
-  }
-
-  private void checkSecretKeySelectors(StackGresScriptReview review,
-                                       List<StackGresScriptEntry> scripts)
-      throws ValidationFailed {
-    String clusterNamespace = review.getRequest().getObject().getMetadata().getNamespace();
-
-    List<SecretKeySelector> secretKeySelectors = scripts.stream()
-        .map(StackGresScriptEntry::getScriptFrom)
-        .filter(Objects::nonNull)
-        .<SecretKeySelector>map(StackGresScriptFrom::getSecretKeyRef)
-        .filter(Objects::nonNull)
-        .toList();
-
-    for (SecretKeySelector secretRef : secretKeySelectors) {
-      Optional<Secret> scriptSecret = secretFinder
-          .findByNameAndNamespace(secretRef.getName(), clusterNamespace);
-
-      if (scriptSecret.isEmpty()) {
-        fail(invalidReference,
-            "Referenced Secret " + secretRef.getName()
-                + " does not exists in namespace " + clusterNamespace);
-      } else if (!scriptSecret.get().getData().containsKey(secretRef.getKey())) {
-        fail(invalidReference,
-            "Key " + secretRef.getKey()
-                + " does not exists in Secret " + secretRef.getName());
-      }
-    }
-  }
-
 }

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptsConfigValidator.java

@@ -8,37 +8,24 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;
 
-import java.util.Arrays;
-import java.util.Map;
-
-import io.fabric8.kubernetes.api.model.SecretBuilder;
-import io.fabric8.kubernetes.api.model.SecretKeySelector;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 import io.restassured.http.ContentType;
 import io.stackgres.common.crd.storages.AwsS3Storage;
-import io.stackgres.common.crd.storages.AwsSecretKeySelector;
-import io.stackgres.common.resource.SecretWriter;
 import io.stackgres.operator.common.StackGresObjectStorageReview;
 import io.stackgres.operator.common.fixture.AdmissionReviewFixtures;
 import io.stackgres.testutil.RandomObjectUtils;
-import io.stackgres.testutil.StringUtils;
-import jakarta.inject.Inject;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
 @WithKubernetesTestServer
 class ObjectStorageValidationResourceTest {
 
-  @Inject
-  SecretWriter writer;
-
   @Test
   @DisplayName("Given a valid creation review should pass")
   void testValidCreate() {
     var review = getValidReview();
-    createMandatorySecrets(review);
 
     given()
         .body(review)
@@ -50,20 +37,6 @@ void testValidCreate() {
 
   }
 
-  @Test
-  @DisplayName("Given a valid creation review should fail")
-  void testInvalidCreated() {
-    var review = getValidReview();
-
-    given()
-        .body(review)
-        .contentType(ContentType.JSON)
-        .post(ValidationUtil.OBJECT_STORAGE_VALIDATION_PATH)
-        .then()
-        .statusCode(200)
-        .body("response.allowed", is(false));
-  }
-
   private StackGresObjectStorageReview getValidReview() {
     StackGresObjectStorageReview review = AdmissionReviewFixtures.objectStorage().loadCreate().get();
     var objectStorage = review.getRequest().getObject();
@@ -79,37 +52,4 @@ private StackGresObjectStorageReview getValidReview() {
     return review;
   }
 
-  private void createMandatorySecrets(StackGresObjectStorageReview review) {
-    var objectStorage = review.getRequest().getObject();
-    final AwsSecretKeySelector secretKeySelectors = objectStorage.getSpec().getS3()
-        .getAwsCredentials().getSecretKeySelectors();
-    var accessKeyId = secretKeySelectors.getAccessKeyId();
-    var secretAccessKey = secretKeySelectors.getSecretAccessKey();
-
-    createSecrets(
-        objectStorage.getMetadata().getNamespace(),
-        accessKeyId, secretAccessKey
-    );
-
-  }
-
-  private void createSecrets(String namespace, SecretKeySelector... selectors) {
-
-    Arrays.stream(selectors).forEach(selector -> {
-      writer.create(
-          new SecretBuilder()
-              .withNewMetadata()
-              .withNamespace(namespace)
-              .withName(selector.getName())
-              .endMetadata()
-              .withData(
-                  Map.of(
-                      selector.getKey(), StringUtils.getRandomString()
-                  )
-              )
-              .build());
-    });
-
-  }
-
 }