Merge pull request #14 from IBM/sdk-update-20230327-122030

Sdk update 20230327 122030

Author: jaksart1

.cra/.cveignore

@@ -3,7 +3,7 @@ language: java
 dist: bionic
 
 jdk:
-- openjdk8
+- openjdk11
 
 notifications:
   email: true
@@ -36,7 +36,7 @@ jobs:
   include:
     # Build and test stage
     - stage: Build-Test
-      jdk: openjdk8
+      jdk: openjdk11
       install: true
       script:
         - build/setMavenVersion.sh
@@ -52,7 +52,7 @@ jobs:
 
     # Publish stage
     - stage: Publish-Release
-      jdk: openjdk8
+      jdk: openjdk11
       name: Publish-Javadoc
       install: true
       if: tag IS present
@@ -62,7 +62,7 @@ jobs:
         - build/publishJavadoc.sh
       after_success:
         - echo "Javadocs successfully published to gh-pages!"
-    # - jdk: openjdk8
+    # - jdk: openjdk11
     #   if: tag IS present
     #   name: Publish-To-Maven-Central
     #   install: true

.travis.yml

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.com/IBM/code-engine-java-sdk.svg?branch=main)](https://travis-ci.com/IBM/code-engine-java-sdk)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-# IBM Cloud Code Engine Java SDK Version 2.0.5
+# IBM Cloud Code Engine Java SDK Version 3.1.0
 
 Java client library to interact with the [Code Engine API](https://cloud.ibm.com/apidocs/codeengine).
 
@@ -39,7 +39,7 @@ The IBM Cloud Code Engine Java SDK allows developers to programmatically interac
 
 Service Name | Artifact Coordinates
 --- | ---
-[Code Engine](https://cloud.ibm.com/apidocs/codeengine/codeengine-v2.0.0) | com.ibm.cloud.code-engine:2.0.5
+[Code Engine](https://cloud.ibm.com/apidocs/codeengine/codeengine-v2.0.0) | com.ibm.cloud.code-engine:3.1.0
 
 ## Prerequisites
 
@@ -51,7 +51,7 @@ Service Name | Artifact Coordinates
 
 ## Installation
 
-The current version of this SDK is: 2.0.5
+The current version of this SDK is: 3.1.0
 
 Each service's artifact coordinates are listed in the table above.
 
@@ -70,14 +70,14 @@ Here are examples for maven and gradle:
 <dependency>
     <groupId>com.ibm.cloud</groupId>
     <artifactId>code-engine</artifactId>
-    <version>2.0.5</version>
+    <version>3.1.0</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```gradle
-compile 'com.ibm.cloud:code-engine:2.0.5'
+compile 'com.ibm.cloud:code-engine:3.1.0'
 ```
 
 ## Using the SDK

README.md

@@ -40,6 +40,11 @@
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <developers>

modules/code-engine/pom.xml

@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 3.64.0-959a5845-20230112-195144
+ * IBM OpenAPI SDK Code Generator Version: 3.66.0-d6c2d7e0-20230215-221247
  */
 
 package com.ibm.cloud.code_engine.code_engine.v2;
@@ -52,6 +52,7 @@
 import com.ibm.cloud.code_engine.code_engine.v2.model.GetConfigMapOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.GetJobOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.GetJobRunOptions;
+import com.ibm.cloud.code_engine.code_engine.v2.model.GetProjectEgressIpsOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.GetProjectOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.GetSecretOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.Job;
@@ -68,6 +69,7 @@
 import com.ibm.cloud.code_engine.code_engine.v2.model.ListProjectsOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.ListSecretsOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.Project;
+import com.ibm.cloud.code_engine.code_engine.v2.model.ProjectEgressIPAddresses;
 import com.ibm.cloud.code_engine.code_engine.v2.model.ProjectList;
 import com.ibm.cloud.code_engine.code_engine.v2.model.ReplaceConfigMapOptions;
 import com.ibm.cloud.code_engine.code_engine.v2.model.ReplaceSecretOptions;
@@ -259,6 +261,30 @@ public ServiceCall<Void> deleteProject(DeleteProjectOptions deleteProjectOptions
     return createServiceCall(builder.build(), responseConverter);
   }
 
+  /**
+   * List egress IP addresses.
+   *
+   * Lists all egress IP addresses (public and private) that are used by components running in this project.
+   *
+   * @param getProjectEgressIpsOptions the {@link GetProjectEgressIpsOptions} containing the options for the call
+   * @return a {@link ServiceCall} with a result of type {@link ProjectEgressIPAddresses}
+   */
+  public ServiceCall<ProjectEgressIPAddresses> getProjectEgressIps(GetProjectEgressIpsOptions getProjectEgressIpsOptions) {
+    com.ibm.cloud.sdk.core.util.Validator.notNull(getProjectEgressIpsOptions,
+      "getProjectEgressIpsOptions cannot be null");
+    Map<String, String> pathParamsMap = new HashMap<String, String>();
+    pathParamsMap.put("project_id", getProjectEgressIpsOptions.projectId());
+    RequestBuilder builder = RequestBuilder.get(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/projects/{project_id}/egress_ips", pathParamsMap));
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("code_engine", "v2", "getProjectEgressIps");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
+    ResponseConverter<ProjectEgressIPAddresses> responseConverter =
+      ResponseConverterUtils.getValue(new com.google.gson.reflect.TypeToken<ProjectEgressIPAddresses>() { }.getType());
+    return createServiceCall(builder.build(), responseConverter);
+  }
+
   /**
    * List applications.
    *

modules/code-engine/src/main/java/com/ibm/cloud/code_engine/code_engine/v2/CodeEngine.java

@@ -170,7 +170,7 @@ public String getEndpointInternal() {
   /**
    * Gets the entityTag.
    *
-   * The version of the job instance, which is used to achieve optimistic locking.
+   * The version of the app instance, which is used to achieve optimistic locking.
    *
    * @return the entityTag
    */

modules/code-engine/src/main/java/com/ibm/cloud/code_engine/code_engine/v2/model/App.java

@@ -24,8 +24,8 @@ public class CreateJobOptions extends GenericModel {
 
   /**
    * The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `max_execution_time` and
-   * `retry_limit` options apply. In `daemon` mode, since there is no timeout and failed instances are restarted
-   * indefinitely, the `max_execution_time` and `retry_limit` options are not allowed.
+   * `retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted
+   * indefinitely, the `max_execution_time` and `retry_limit` properties are not allowed.
    */
   public interface RunMode {
     /** task. */
@@ -36,7 +36,7 @@ public interface RunMode {
 
   /**
    * The name of the service account. For built-in service accounts, you can use the shortened names `manager`, `none`,
-   * `reader`, and `writer`.
+   * `reader`, and `writer`. This property must not be set on a job run, which references a job template.
    */
   public interface RunServiceAccount {
     /** default. */
@@ -479,7 +479,7 @@ public String name() {
    * The name of the image registry access secret. The image registry access secret is used to authenticate with a
    * private registry when you download the container image. If the image reference points to a registry that requires
    * authentication, the job / job runs will be created but submitted job runs will fail, until this property is
-   * provided, too.
+   * provided, too. This property must not be set on a job run, which references a job template.
    *
    * @return the imageSecret
    */
@@ -537,8 +537,8 @@ public List<EnvVarPrototype> runEnvVariables() {
    * Gets the runMode.
    *
    * The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `max_execution_time` and
-   * `retry_limit` options apply. In `daemon` mode, since there is no timeout and failed instances are restarted
-   * indefinitely, the `max_execution_time` and `retry_limit` options are not allowed.
+   * `retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted
+   * indefinitely, the `max_execution_time` and `retry_limit` properties are not allowed.
    *
    * @return the runMode
    */
@@ -550,7 +550,7 @@ public String runMode() {
    * Gets the runServiceAccount.
    *
    * The name of the service account. For built-in service accounts, you can use the shortened names `manager`, `none`,
-   * `reader`, and `writer`.
+   * `reader`, and `writer`. This property must not be set on a job run, which references a job template.
    *
    * @return the runServiceAccount
    */
@@ -611,7 +611,8 @@ public String scaleEphemeralStorageLimit() {
   /**
    * Gets the scaleMaxExecutionTime.
    *
-   * The maximum execution time in seconds for runs of the job. This option can only be specified if `mode` is `task`.
+   * The maximum execution time in seconds for runs of the job. This property can only be specified if `run_mode` is
+   * `task`.
    *
    * @return the scaleMaxExecutionTime
    */
@@ -637,8 +638,8 @@ public String scaleMemoryLimit() {
   /**
    * Gets the scaleRetryLimit.
    *
-   * The number of times to rerun an instance of the job before the job is marked as failed. This option can only be
-   * specified if `mode` is `task`.
+   * The number of times to rerun an instance of the job before the job is marked as failed. This property can only be
+   * specified if `run_mode` is `task`.
    *
    * @return the scaleRetryLimit
    */

modules/code-engine/src/main/java/com/ibm/cloud/code_engine/code_engine/v2/model/CreateJobOptions.java

@@ -24,8 +24,8 @@ public class CreateJobRunOptions extends GenericModel {
 
   /**
    * The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `max_execution_time` and
-   * `retry_limit` options apply. In `daemon` mode, since there is no timeout and failed instances are restarted
-   * indefinitely, the `max_execution_time` and `retry_limit` options are not allowed.
+   * `retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted
+   * indefinitely, the `max_execution_time` and `retry_limit` properties are not allowed.
    */
   public interface RunMode {
     /** task. */
@@ -36,7 +36,7 @@ public interface RunMode {
 
   /**
    * The name of the service account. For built-in service accounts, you can use the shortened names `manager`, `none`,
-   * `reader`, and `writer`.
+   * `reader`, and `writer`. This property must not be set on a job run, which references a job template.
    */
   public interface RunServiceAccount {
     /** default. */
@@ -475,7 +475,7 @@ public String imageReference() {
    * The name of the image registry access secret. The image registry access secret is used to authenticate with a
    * private registry when you download the container image. If the image reference points to a registry that requires
    * authentication, the job / job runs will be created but submitted job runs will fail, until this property is
-   * provided, too.
+   * provided, too. This property must not be set on a job run, which references a job template.
    *
    * @return the imageSecret
    */
@@ -556,8 +556,8 @@ public List<EnvVarPrototype> runEnvVariables() {
    * Gets the runMode.
    *
    * The mode for runs of the job. Valid values are `task` and `daemon`. In `task` mode, the `max_execution_time` and
-   * `retry_limit` options apply. In `daemon` mode, since there is no timeout and failed instances are restarted
-   * indefinitely, the `max_execution_time` and `retry_limit` options are not allowed.
+   * `retry_limit` properties apply. In `daemon` mode, since there is no timeout and failed instances are restarted
+   * indefinitely, the `max_execution_time` and `retry_limit` properties are not allowed.
    *
    * @return the runMode
    */
@@ -569,7 +569,7 @@ public String runMode() {
    * Gets the runServiceAccount.
    *
    * The name of the service account. For built-in service accounts, you can use the shortened names `manager`, `none`,
-   * `reader`, and `writer`.
+   * `reader`, and `writer`. This property must not be set on a job run, which references a job template.
    *
    * @return the runServiceAccount
    */
@@ -630,7 +630,8 @@ public String scaleEphemeralStorageLimit() {
   /**
    * Gets the scaleMaxExecutionTime.
    *
-   * The maximum execution time in seconds for runs of the job. This option can only be specified if `mode` is `task`.
+   * The maximum execution time in seconds for runs of the job. This property can only be specified if `run_mode` is
+   * `task`.
    *
    * @return the scaleMaxExecutionTime
    */
@@ -656,8 +657,8 @@ public String scaleMemoryLimit() {
   /**
    * Gets the scaleRetryLimit.
    *
-   * The number of times to rerun an instance of the job before the job is marked as failed. This option can only be
-   * specified if `mode` is `task`.
+   * The number of times to rerun an instance of the job before the job is marked as failed. This property can only be
+   * specified if `run_mode` is `task`.
    *
    * @return the scaleRetryLimit
    */

modules/code-engine/src/main/java/com/ibm/cloud/code_engine/code_engine/v2/model/CreateJobRunOptions.java

@@ -12,8 +12,6 @@
  */
 package com.ibm.cloud.code_engine.code_engine.v2.model;
 
-import java.util.Map;
-
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
 /**
@@ -44,7 +42,7 @@ public interface Format {
   protected String projectId;
   protected String format;
   protected String name;
-  protected Map<String, String> data;
+  protected SecretData data;
 
   /**
    * Builder.
@@ -53,7 +51,7 @@ public static class Builder {
     private String projectId;
     private String format;
     private String name;
-    private Map<String, String> data;
+    private SecretData data;
 
     /**
      * Instantiates a new Builder from an existing CreateSecretOptions instance.
@@ -134,7 +132,7 @@ public Builder name(String name) {
      * @param data the data
      * @return the CreateSecretOptions builder
      */
-    public Builder data(Map<String, String> data) {
+    public Builder data(SecretData data) {
       this.data = data;
       return this;
     }
@@ -206,7 +204,7 @@ public String name() {
    *
    * @return the data
    */
-  public Map<String, String> data() {
+  public SecretData data() {
     return data;
   }
 }