Merge pull request #1206 from watson-developer-cloud/major-03-2022

Major 03 2022

Author: kevinkowa

.bumpversion.cfg

@@ -9,26 +9,16 @@ replace = {new_version}
 
 [bumpversion:file:assistant/README.md]
 
-[bumpversion:file:compare-comply/README.md]
-
 [bumpversion:file:discovery/README.md]
 
 [bumpversion:file:language-translator/README.md]
 
-[bumpversion:file:natural-language-classifier/README.md]
-
 [bumpversion:file:natural-language-understanding/README.md]
 
-[bumpversion:file:personality-insights/README.md]
-
 [bumpversion:file:speech-to-text/README.md]
 
 [bumpversion:file:text-to-speech/README.md]
 
-[bumpversion:file:tone-analyzer/README.md]
-
-[bumpversion:file:visual-recognition/README.md]
-
 [bumpversion:file:docker/pom.xml]
 
 [bumpversion:file:examples/build.gradle]

.github/workflows/integration-test.yml

@@ -32,29 +32,16 @@ jobs:
       # continue-on-error: true
       env:
         MVN_ARGS: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-        NATURAL_LANGUAGE_CLASSIFIER_URL: "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com"
-        NATURAL_LANGUAGE_CLASSIFIER_APIKEY: ${{ secrets.NLC_APIKEY }}
-        NATURAL_LANGUAGE_CLASSIFIER_ID: ${{ secrets.NLC_CLASSIFIER_ID }}
         LANGUAGE_TRANSLATOR_APIKEY: ${{ secrets.LT_APIKEY }}
         LANGUAGE_TRANSLATOR_URL: "https://api.us-south.language-translator.watson.cloud.ibm.com"
         NATURAL_LANGUAGE_UNDERSTANDING_APIKEY: ${{ secrets.NLU_APIKEY }}
         NATURAL_LANGUAGE_UNDERSTANDING_URL: "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com"
-        PERSONALITY_INSIGHTS_APIKEY: ${{ secrets.PI_APIKEY }}
-        PERSONALITY_INSIGHTS_URL: "https://api.us-south.personality-insights.watson.cloud.ibm.com"
-        TONE_ANALYZER_APIKEY: ${{ secrets.TA_APIKEY }}
-        TONE_ANALYZER_URL: "https://api.us-south.tone-analyzer.watson.cloud.ibm.com"
         SPEECH_TO_TEXT_APIKEY: ${{ secrets.STT_APIKEY }}
         SPEECH_TO_TEXT_URL: "https://api.us-south.speech-to-text.watson.cloud.ibm.com"
         SPEECH_TO_TEXT_CUSTOM_ID: ${{ secrets.STT_APIKEY_CUSTOM_ID }}
         SPEECH_TO_TEXT_ACOUSTIC_CUSTOM_ID: ${{ secrets.STT_APIKEY_ACOUSTIC_CUSTOM_ID }}
         TEXT_TO_SPEECH_APIKEY: ${{ secrets.TTS_APIKEY }}
         TEXT_TO_SPEECH_URL: "https://api.us-south.text-to-speech.watson.cloud.ibm.com"
-        VISUAL_RECOGNITION_APIKEY: ${{ secrets.VR_APIKEY }}
-        VISUAL_RECOGNITION_COLLECTION_ID: ${{ secrets.VR_COLLECTION_ID }}
-        VISUAL_RECOGNITION_URL: "https://api.us-south.visual-recognition.watson.cloud.ibm.com"
-        COMPARE_COMPLY_APIKEY: ${{ secrets.CC_APIKEY }}
-        COMPARE_COMPLY_FEEDBACK_ID: ${{ secrets.CC_FEEDBACK_ID }}
-        COMPARE_COMPLY_URL: "https://api.us-south.compare-comply.watson.cloud.ibm.com"
         ASSISTANT_APIKEY: ${{ secrets.WA_APIKEY }}
         ASSISTANT_WORKSPACE_ID: ${{ secrets.WA_WORKSPACE_ID }}
         ASSISTANT_ASSISTANT_ID: ${{ secrets.WA_ASSISTANT_ID }}
@@ -70,19 +57,13 @@ jobs:
       run: |
         mvn test -Dtest=v1/AssistantServiceIT -DfailIfNoTests=false -pl assistant,common $MVN_ARGS
         mvn test -Dtest=v2/AssistantServiceIT -DfailIfNoTests=false -pl assistant,common $MVN_ARGS
-        echo -e "\n\033[0;35mSKIP: mvn test -Dtest=CompareComplyServiceIT -DfailIfNoTests=false -pl compare-comply,common $MVN_ARGS"
         mvn test -Dtest=v1/DiscoveryServiceIT -DfailIfNoTests=false -pl discovery,common $MVN_ARGS
         mvn test -Dtest=v2/DiscoveryIT -DfailIfNoTests=false -pl discovery,common $MVN_ARGS
         mvn test -Dtest=LanguageTranslatorIT -DfailIfNoTests=false -pl language-translator,common $MVN_ARGS
-        mvn test -Dtest=NaturalLanguageClassifierIT -DfailIfNoTests=false -pl natural-language-classifier,common $MVN_ARGS
         mvn test -Dtest=NaturalLanguageUnderstandingIT -DfailIfNoTests=false -pl natural-language-understanding,common $MVN_ARGS
-        mvn test -Dtest=PersonalityInsightsIT -DfailIfNoTests=false -pl personality-insights,common $MVN_ARGS
         mvn test -Dtest=SpeechToTextIT -DfailIfNoTests=false -pl speech-to-text,common $MVN_ARGS
         mvn test -Dtest=TextToSpeechIT -DfailIfNoTests=false -pl text-to-speech,common $MVN_ARGS
         mvn test -Dtest=CustomizationsIT -DfailIfNoTests=false -pl text-to-speech,common $MVN_ARGS
-        mvn test -Dtest=ToneAnalyzerIT -DfailIfNoTests=false -pl tone-analyzer,common $MVN_ARGS
-        echo -e "\n\033[0;35mSKIP: mvn test -Dtest=v3/VisualRecognitionIT -DfailIfNoTests=false -pl visual-recognition,common $MVN_ARGS"
-        echo -e "\n\033[0;35mSKIP: mvn test -Dtest=v4/VisualRecognitionIT -DfailIfNoTests=false -pl visual-recognition,common $MVN_ARGS"
 
       # Do not notify on success.  We will leave the code here just in case we decide to switch gears
     - name: Notify slack on success

.secrets.baseline

@@ -1,9 +1,9 @@
 {
   "exclude": {
-    "files": "package-lock.json|credentials.json",
+    "files": "package-lock.json|credentials.json|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2020-03-03T19:34:45Z",
+  "generated_at": "2022-03-18T18:58:41Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -25,9 +25,7 @@
       "name": "CloudantDetector"
     },
     {
-      "name": "Db2Detector"
-    },
-    {
+      "ghe_instance": "github.ibm.com",
       "name": "GheDetector"
     },
     {
@@ -66,8 +64,57 @@
       "name": "TwilioKeyDetector"
     }
   ],
-  "results": {},
-  "version": "0.13.0+ibm.9.dss",
+  "results": {
+    "CHANGELOG.md": [
+      {
+        "hashed_secret": "939999726d2023fca902233e45790c08081dc91b",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 90,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
+    "assistant/src/test/resources/assistant/assistant.json": [
+      {
+        "hashed_secret": "49568690e3778497671beb117ceecc48e01cdd4c",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 117,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "assistant/src/test/resources/assistant/message_response.json": [
+      {
+        "hashed_secret": "d506bd5213c46bd49e16c634754ad70113408252",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 165,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "discovery/src/main/java/com/ibm/watson/discovery/v1/model/CredentialDetails.java": [
+      {
+        "hashed_secret": "e8fc807ce6fbcda13f91c5b64850173873de0cdc",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 42,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "fdee05598fdd57ff8e9ae29e92c25a04f2c52fa6",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 44,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ]
+  },
+  "version": "0.13.1+ibm.47.dss",
   "word_list": {
     "file": null,
     "hash": null

assistant/src/main/java/com/ibm/watson/assistant/v1/Assistant.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2021.
+ * (C) Copyright IBM Corp. 2019, 2022.
  *
  * 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
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 3.38.0-07189efd-20210827-205025
+ * IBM OpenAPI SDK Code Generator Version: 3.46.0-a4e29da0-20220224-210428
  */
 
 package com.ibm.watson.assistant.v1;
@@ -121,7 +121,7 @@ public class Assistant extends BaseService {
    * the client instance.
    *
    * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD
-   *     format. The current version is `2021-06-14`.
+   *     format. The current version is `2021-11-27`.
    */
   public Assistant(String version) {
     this(
@@ -135,7 +135,7 @@ public Assistant(String version) {
    * authenticator are used to configure the client instance.
    *
    * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD
-   *     format. The current version is `2021-06-14`.
+   *     format. The current version is `2021-11-27`.
    * @param authenticator the {@link Authenticator} instance to be configured for this client
    */
   public Assistant(String version, Authenticator authenticator) {
@@ -147,7 +147,7 @@ public Assistant(String version, Authenticator authenticator) {
    * configure the client instance.
    *
    * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD
-   *     format. The current version is `2021-06-14`.
+   *     format. The current version is `2021-11-27`.
    * @param serviceName the service name to be used when configuring the client instance
    */
   public Assistant(String version, String serviceName) {
@@ -159,7 +159,7 @@ public Assistant(String version, String serviceName) {
    * are used to configure the client instance.
    *
    * @param version Release date of the API version you want to use. Specify dates in YYYY-MM-DD
-   *     format. The current version is `2021-06-14`.
+   *     format. The current version is `2021-11-27`.
    * @param serviceName the service name to be used when configuring the client instance
    * @param authenticator the {@link Authenticator} instance to be configured for this client
    */
@@ -174,7 +174,7 @@ public Assistant(String version, String serviceName, Authenticator authenticator
    * Gets the version.
    *
    * <p>Release date of the API version you want to use. Specify dates in YYYY-MM-DD format. The
-   * current version is `2021-06-14`.
+   * current version is `2021-11-27`.
    *
    * @return the version
    */

assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2018, 2021.
+ * (C) Copyright IBM Corp. 2018, 2022.
  *
  * 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
@@ -27,7 +27,10 @@
  * DialogNodeOutputGenericDialogNodeOutputResponseTypeConnectToAgent -
  * DialogNodeOutputGenericDialogNodeOutputResponseTypeSearchSkill -
  * DialogNodeOutputGenericDialogNodeOutputResponseTypeChannelTransfer -
- * DialogNodeOutputGenericDialogNodeOutputResponseTypeUserDefined
+ * DialogNodeOutputGenericDialogNodeOutputResponseTypeUserDefined -
+ * DialogNodeOutputGenericDialogNodeOutputResponseTypeVideo -
+ * DialogNodeOutputGenericDialogNodeOutputResponseTypeAudio -
+ * DialogNodeOutputGenericDialogNodeOutputResponseTypeIframe
  */
 public class DialogNodeOutputGeneric extends GenericModel {
   @SuppressWarnings("unused")
@@ -37,12 +40,16 @@ public class DialogNodeOutputGeneric extends GenericModel {
 
   static {
     discriminatorMapping = new java.util.HashMap<>();
+    discriminatorMapping.put(
+        "audio", DialogNodeOutputGenericDialogNodeOutputResponseTypeAudio.class);
     discriminatorMapping.put(
         "channel_transfer",
         DialogNodeOutputGenericDialogNodeOutputResponseTypeChannelTransfer.class);
     discriminatorMapping.put(
         "connect_to_agent",
         DialogNodeOutputGenericDialogNodeOutputResponseTypeConnectToAgent.class);
+    discriminatorMapping.put(
+        "iframe", DialogNodeOutputGenericDialogNodeOutputResponseTypeIframe.class);
     discriminatorMapping.put(
         "image", DialogNodeOutputGenericDialogNodeOutputResponseTypeImage.class);
     discriminatorMapping.put(
@@ -54,6 +61,8 @@ public class DialogNodeOutputGeneric extends GenericModel {
     discriminatorMapping.put("text", DialogNodeOutputGenericDialogNodeOutputResponseTypeText.class);
     discriminatorMapping.put(
         "user_defined", DialogNodeOutputGenericDialogNodeOutputResponseTypeUserDefined.class);
+    discriminatorMapping.put(
+        "video", DialogNodeOutputGenericDialogNodeOutputResponseTypeVideo.class);
   }
 
   /** How a response is selected from the list, if more than one response is specified. */
@@ -129,6 +138,12 @@ public interface QueryType {
   @SerializedName("user_defined")
   protected Map<String, Object> userDefined;
 
+  @SerializedName("channel_options")
+  protected Map<String, Object> channelOptions;
+
+  @SerializedName("image_url")
+  protected String imageUrl;
+
   protected DialogNodeOutputGeneric() {}
 
   /**
@@ -384,4 +399,26 @@ public String messageToUser() {
   public Map<String, Object> userDefined() {
     return userDefined;
   }
+
+  /**
+   * Gets the channelOptions.
+   *
+   * <p>For internal use only.
+   *
+   * @return the channelOptions
+   */
+  public Map<String, Object> channelOptions() {
+    return channelOptions;
+  }
+
+  /**
+   * Gets the imageUrl.
+   *
+   * <p>The URL of an image that shows a preview of the embedded content.
+   *
+   * @return the imageUrl
+   */
+  public String imageUrl() {
+    return imageUrl;
+  }
 }