Merge branch 'main' into Headobject

Author: kai-ion

VERSION

@@ -1 +1 @@
-1.11.847
+1.11.848

generated/src/aws-cpp-sdk-bedrock-agentcore-control/include/aws/bedrock-agentcore-control/model/HarnessGeminiModelConfig.h

@@ -5,6 +5,7 @@
 
 #pragma once
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControl_EXPORTS.h>
+#include <aws/core/utils/Document.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 
 #include <utility>
@@ -132,6 +133,25 @@ class HarnessGeminiModelConfig {
     return *this;
   }
   ///@}
+
+  ///@{
+  /**
+   * <p>Provider-specific parameters passed through to the Gemini model provider
+   * unchanged.</p>
+   */
+  inline Aws::Utils::DocumentView GetAdditionalParams() const { return m_additionalParams; }
+  inline bool AdditionalParamsHasBeenSet() const { return m_additionalParamsHasBeenSet; }
+  template <typename AdditionalParamsT = Aws::Utils::Document>
+  void SetAdditionalParams(AdditionalParamsT&& value) {
+    m_additionalParamsHasBeenSet = true;
+    m_additionalParams = std::forward<AdditionalParamsT>(value);
+  }
+  template <typename AdditionalParamsT = Aws::Utils::Document>
+  HarnessGeminiModelConfig& WithAdditionalParams(AdditionalParamsT&& value) {
+    SetAdditionalParams(std::forward<AdditionalParamsT>(value));
+    return *this;
+  }
+  ///@}
  private:
   Aws::String m_modelId;
 
@@ -144,12 +164,15 @@ class HarnessGeminiModelConfig {
   double m_topP{0.0};
 
   int m_topK{0};
+
+  Aws::Utils::Document m_additionalParams;
   bool m_modelIdHasBeenSet = false;
   bool m_apiKeyArnHasBeenSet = false;
   bool m_maxTokensHasBeenSet = false;
   bool m_temperatureHasBeenSet = false;
   bool m_topPHasBeenSet = false;
   bool m_topKHasBeenSet = false;
+  bool m_additionalParamsHasBeenSet = false;
 };
 
 }  // namespace Model

generated/src/aws-cpp-sdk-bedrock-agentcore-control/source/model/HarnessGeminiModelConfig.cpp

@@ -42,6 +42,10 @@ HarnessGeminiModelConfig& HarnessGeminiModelConfig::operator=(JsonView jsonValue
     m_topK = jsonValue.GetInteger("topK");
     m_topKHasBeenSet = true;
   }
+  if (jsonValue.ValueExists("additionalParams")) {
+    m_additionalParams = jsonValue.GetObject("additionalParams");
+    m_additionalParamsHasBeenSet = true;
+  }
   return *this;
 }
 
@@ -72,6 +76,12 @@ JsonValue HarnessGeminiModelConfig::Jsonize() const {
     payload.WithInteger("topK", m_topK);
   }
 
+  if (m_additionalParamsHasBeenSet) {
+    if (!m_additionalParams.View().IsNull()) {
+      payload.WithObject("additionalParams", JsonValue(m_additionalParams.View()));
+    }
+  }
+
   return payload;
 }
 

generated/src/aws-cpp-sdk-elasticloadbalancingv2/include/aws/elasticloadbalancingv2/model/SourceIpAddressTypeEnum.h

@@ -0,0 +1,22 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2_EXPORTS.h>
+
+namespace Aws {
+namespace ElasticLoadBalancingv2 {
+namespace Model {
+enum class SourceIpAddressTypeEnum { NOT_SET, ipv4, ipv6 };
+
+namespace SourceIpAddressTypeEnumMapper {
+AWS_ELASTICLOADBALANCINGV2_API SourceIpAddressTypeEnum GetSourceIpAddressTypeEnumForName(const Aws::String& name);
+
+AWS_ELASTICLOADBALANCINGV2_API Aws::String GetNameForSourceIpAddressTypeEnum(SourceIpAddressTypeEnum value);
+}  // namespace SourceIpAddressTypeEnumMapper
+}  // namespace Model
+}  // namespace ElasticLoadBalancingv2
+}  // namespace Aws

generated/src/aws-cpp-sdk-elasticloadbalancingv2/include/aws/elasticloadbalancingv2/model/SourceIpConditionConfig.h

@@ -8,6 +8,7 @@
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2_EXPORTS.h>
+#include <aws/elasticloadbalancingv2/model/SourceIpAddressTypeEnum.h>
 
 #include <utility>
 
@@ -69,9 +70,30 @@ class SourceIpConditionConfig {
     return *this;
   }
   ///@}
+
+  ///@{
+  /**
+   * <p>The IP address type for Network Load Balancers.</p> <p>The valid values
+   * are:</p> <ul> <li> <p> <code>ipv4</code> – IPv4 addresses only.</p> </li> <li>
+   * <p> <code>ipv6</code> – IPv6 addresses only.</p> </li> </ul>
+   */
+  inline SourceIpAddressTypeEnum GetIpAddressType() const { return m_ipAddressType; }
+  inline bool IpAddressTypeHasBeenSet() const { return m_ipAddressTypeHasBeenSet; }
+  inline void SetIpAddressType(SourceIpAddressTypeEnum value) {
+    m_ipAddressTypeHasBeenSet = true;
+    m_ipAddressType = value;
+  }
+  inline SourceIpConditionConfig& WithIpAddressType(SourceIpAddressTypeEnum value) {
+    SetIpAddressType(value);
+    return *this;
+  }
+  ///@}
  private:
   Aws::Vector<Aws::String> m_values;
+
+  SourceIpAddressTypeEnum m_ipAddressType{SourceIpAddressTypeEnum::NOT_SET};
   bool m_valuesHasBeenSet = false;
+  bool m_ipAddressTypeHasBeenSet = false;
 };
 
 }  // namespace Model

generated/src/aws-cpp-sdk-elasticloadbalancingv2/source/model/SourceIpAddressTypeEnum.cpp

@@ -0,0 +1,58 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/elasticloadbalancingv2/model/SourceIpAddressTypeEnum.h>
+
+using namespace Aws::Utils;
+
+namespace Aws {
+namespace ElasticLoadBalancingv2 {
+namespace Model {
+namespace SourceIpAddressTypeEnumMapper {
+
+static const int ipv4_HASH = HashingUtils::HashString("ipv4");
+static const int ipv6_HASH = HashingUtils::HashString("ipv6");
+
+SourceIpAddressTypeEnum GetSourceIpAddressTypeEnumForName(const Aws::String& name) {
+  int hashCode = HashingUtils::HashString(name.c_str());
+  if (hashCode == ipv4_HASH) {
+    return SourceIpAddressTypeEnum::ipv4;
+  } else if (hashCode == ipv6_HASH) {
+    return SourceIpAddressTypeEnum::ipv6;
+  }
+  EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+  if (overflowContainer) {
+    overflowContainer->StoreOverflow(hashCode, name);
+    return static_cast<SourceIpAddressTypeEnum>(hashCode);
+  }
+
+  return SourceIpAddressTypeEnum::NOT_SET;
+}
+
+Aws::String GetNameForSourceIpAddressTypeEnum(SourceIpAddressTypeEnum enumValue) {
+  switch (enumValue) {
+    case SourceIpAddressTypeEnum::NOT_SET:
+      return {};
+    case SourceIpAddressTypeEnum::ipv4:
+      return "ipv4";
+    case SourceIpAddressTypeEnum::ipv6:
+      return "ipv6";
+    default:
+      EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+      if (overflowContainer) {
+        return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+      }
+
+      return {};
+  }
+}
+
+}  // namespace SourceIpAddressTypeEnumMapper
+}  // namespace Model
+}  // namespace ElasticLoadBalancingv2
+}  // namespace Aws

generated/src/aws-cpp-sdk-elasticloadbalancingv2/source/model/SourceIpConditionConfig.cpp

@@ -34,6 +34,12 @@ SourceIpConditionConfig& SourceIpConditionConfig::operator=(const XmlNode& xmlNo
 
       m_valuesHasBeenSet = true;
     }
+    XmlNode ipAddressTypeNode = resultNode.FirstChild("IpAddressType");
+    if (!ipAddressTypeNode.IsNull()) {
+      m_ipAddressType = SourceIpAddressTypeEnumMapper::GetSourceIpAddressTypeEnumForName(
+          StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(ipAddressTypeNode.GetText()).c_str()));
+      m_ipAddressTypeHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -47,6 +53,11 @@ void SourceIpConditionConfig::OutputToStream(Aws::OStream& oStream, const char*
               << "&";
     }
   }
+
+  if (m_ipAddressTypeHasBeenSet) {
+    oStream << location << index << locationValue << ".IpAddressType="
+            << StringUtils::URLEncode(SourceIpAddressTypeEnumMapper::GetNameForSourceIpAddressTypeEnum(m_ipAddressType)) << "&";
+  }
 }
 
 void SourceIpConditionConfig::OutputToStream(Aws::OStream& oStream, const char* location) const {
@@ -56,6 +67,10 @@ void SourceIpConditionConfig::OutputToStream(Aws::OStream& oStream, const char*
       oStream << location << ".Values.member." << valuesIdx++ << "=" << StringUtils::URLEncode(item.c_str()) << "&";
     }
   }
+  if (m_ipAddressTypeHasBeenSet) {
+    oStream << location << ".IpAddressType="
+            << StringUtils::URLEncode(SourceIpAddressTypeEnumMapper::GetNameForSourceIpAddressTypeEnum(m_ipAddressType)) << "&";
+  }
 }
 
 }  // namespace Model