Merge remote-tracking branch 'upstream/master' into ownerref

Author: tony-clarke-amdocs

.gitignore

@@ -5,6 +5,7 @@
 .settings/
 .project
 .vscode/
+.attach_pid*
 
 # Maven builds
 */target/

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventUtils.java

@@ -13,7 +13,7 @@
 package io.kubernetes.client.extended.event.legacy;
 
 import io.kubernetes.client.openapi.models.CoreV1Event;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.joda.time.DateTime;
 

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlAnnotate.java

@@ -20,7 +20,7 @@
 import io.kubernetes.client.util.generic.KubernetesApiResponse;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class KubectlAnnotate<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlAnnotate<ApiType>>

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDelete.java

@@ -16,7 +16,7 @@
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class KubectlDelete<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlDelete<ApiType>>

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlGet.java

@@ -19,7 +19,7 @@
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 import io.kubernetes.client.util.generic.options.ListOptions;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class KubectlGet<ApiType extends KubernetesObject>
     extends Kubectl.ApiClientBuilder<KubectlGet<ApiType>>

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlLabel.java

@@ -19,7 +19,7 @@
 import io.kubernetes.client.util.labels.Labels;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class KubectlLabel<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlLabel<ApiType>>

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlReplace.java

@@ -17,7 +17,7 @@
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.generic.options.UpdateOptions;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class KubectlReplace<ApiType extends KubernetesObject>
     extends Kubectl.ResourceBuilder<ApiType, KubectlReplace<ApiType>>

kubernetes/pom.xml

@@ -141,6 +141,7 @@
     <dependency>
       <groupId>io.sundr</groupId>
       <artifactId>builder-annotations</artifactId>
+       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>

spring/src/main/java/io/kubernetes/client/spring/extended/manifests/KubernetesFromYamlProcessor.java

@@ -0,0 +1,115 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 io.kubernetes.client.spring.extended.manifests;
+
+import com.google.common.io.Resources;
+import io.kubernetes.client.spring.extended.manifests.annotation.FromYaml;
+import io.kubernetes.client.util.Yaml;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessor;
+import org.springframework.util.ReflectionUtils;
+import org.yaml.snakeyaml.error.YAMLException;
+
+public class KubernetesFromYamlProcessor
+    implements InstantiationAwareBeanPostProcessor, BeanPostProcessor, BeanFactoryAware {
+
+  private static final Logger log = LoggerFactory.getLogger(KubernetesFromYamlProcessor.class);
+
+  private ListableBeanFactory beanFactory;
+
+  public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+
+    FromYaml fromYamlAnnotation;
+    try {
+      fromYamlAnnotation = beanFactory.findAnnotationOnBean(beanName, FromYaml.class);
+      if (fromYamlAnnotation != null) {
+        Object loadedObj = loadFromYaml(fromYamlAnnotation.filePath());
+        if (!bean.getClass().isAssignableFrom(loadedObj.getClass())) {
+          log.warn(
+              "Incompatible types for @FromYaml, {} cannot apply to {}",
+              fromYamlAnnotation.filePath(),
+              bean.getClass());
+          return bean;
+        }
+        return loadedObj;
+      }
+    } catch (NoSuchBeanDefinitionException e) {
+      return bean;
+    }
+
+    for (Field field : bean.getClass().getDeclaredFields()) {
+      ReflectionUtils.makeAccessible(field);
+      try {
+        if (field.get(bean) != null) {
+          continue; // field already set, skip processing
+        }
+      } catch (IllegalAccessException e) {
+        log.warn("Failed inject resource for @FromYaml annotated field {}", field, e);
+        continue;
+      }
+
+      fromYamlAnnotation = field.getAnnotation(FromYaml.class);
+      if (fromYamlAnnotation == null) {
+        continue; // skip if the field doesn't have the annotation
+      }
+
+      Object loadedObj = loadFromYaml(fromYamlAnnotation.filePath());
+      ReflectionUtils.setField(field, bean, loadedObj);
+    }
+    return bean;
+  }
+
+  @Override
+  public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+    this.beanFactory = (ListableBeanFactory) beanFactory;
+  }
+
+  private Object loadFromYaml(String targetFilePath) {
+    Path targetPath = Paths.get(targetFilePath);
+    if (!Files.exists(Paths.get(targetFilePath))) { // checks if it exists on the machine
+      // otherwise use load from classpath resources
+      Path classPath = Paths.get(Resources.getResource(targetFilePath).getPath());
+      if (Files.exists(classPath)) { // use classpath it works
+        targetPath = classPath;
+      } else {
+        throw new BeanCreationException(
+            "No such file " + targetFilePath + " either on the machine or classpaths");
+      }
+    }
+
+    try {
+      String yamlContent = new String(Files.readAllBytes(targetPath));
+      Object loadedObj = Yaml.load(yamlContent);
+      return loadedObj;
+    } catch (IOException e) {
+      log.error("Failed reading resource for @FromYaml annotated from {}", targetFilePath, e);
+      throw new BeanCreationException("Failed reading Yaml resource from file", e);
+    } catch (YAMLException e) {
+      log.error("Failed parsing yaml file {}", targetFilePath, e);
+      throw new BeanCreationException("Failed parsing Yaml", e);
+    }
+  }
+}

spring/src/main/java/io/kubernetes/client/spring/extended/manifests/KubernetesKubectlApplyProcessor.java

@@ -0,0 +1,72 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 io.kubernetes.client.spring.extended.manifests;
+
+import io.kubernetes.client.common.KubernetesObject;
+import io.kubernetes.client.extended.kubectl.Kubectl;
+import io.kubernetes.client.extended.kubectl.exception.KubectlException;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.spring.extended.manifests.annotation.KubectlApply;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
+public class KubernetesKubectlApplyProcessor implements BeanPostProcessor, BeanFactoryAware {
+
+  private static final Logger log = LoggerFactory.getLogger(KubernetesKubectlApplyProcessor.class);
+
+  private ListableBeanFactory beanFactory;
+
+  @Autowired private ApiClient apiClient;
+
+  public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+    if (!(bean instanceof KubernetesObject)) {
+      return bean; // no-op
+    }
+
+    KubectlApply apply = beanFactory.findAnnotationOnBean(beanName, KubectlApply.class);
+    if (apply == null) {
+      return bean;
+    }
+
+    Class<? extends KubernetesObject> apiTypeClass =
+        (Class<? extends KubernetesObject>) bean.getClass();
+
+    try {
+      log.info("@KubectlApply ensuring resource upon bean {}", beanName);
+      return apply(apiTypeClass, bean);
+    } catch (KubectlException e) {
+      log.error("Failed ensuring resource from @KubectlApply", e);
+      throw new BeanCreationException("Failed ensuring resource from @KubectlApply", e);
+    }
+  }
+
+  public <ApiType extends KubernetesObject> ApiType apply(Class<ApiType> apiTypeClass, Object obj)
+      throws KubectlException {
+    return Kubectl.apply(apiTypeClass)
+        .apiClient(this.apiClient)
+        .resource((ApiType) obj)
+        .execute(); // replaced the bean of the created status
+  }
+
+  @Override
+  public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+    this.beanFactory = (ListableBeanFactory) beanFactory;
+  }
+}