From e07df9b54a0ea979adfcb0b5e3dd2a47226fcd8c Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 3 Dec 2024 16:29:09 +0100 Subject: [PATCH] Remove session token and profile credential name Signed-off-by: Matthias Wessendorf --- config/core/resources/integrationsink.yaml | 25 ---------------- config/core/resources/integrationsource.yaml | 30 -------------------- pkg/apis/common/integration/v1alpha1/aws.go | 8 ++---- 3 files changed, 3 insertions(+), 60 deletions(-) diff --git a/config/core/resources/integrationsink.yaml b/config/core/resources/integrationsink.yaml index 80a790c9f6a..0c41963a9d4 100644 --- a/config/core/resources/integrationsink.yaml +++ b/config/core/resources/integrationsink.yaml @@ -165,16 +165,6 @@ spec: true overrides any behavior defined by the `includeBody` option. If false, the S3 object is put in the body. default: false - profileCredentialsName: - type: string - title: Profile Credentials Name - description: If using a profile credentials provider this parameter - will set the profile name. - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - a IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI @@ -242,16 +232,6 @@ spec: type: string title: Queue URL description: The full SQS Queue URL (required if using KEDA) - profileCredentialsName: - type: string - title: Profile Credentials Name - description: If using a profile credentials provider this parameter - will set the profile name. - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - a IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI @@ -313,11 +293,6 @@ spec: title: Autocreate Topic description: Setting the autocreation of the SNS topic. default: false - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - a IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI diff --git a/config/core/resources/integrationsource.yaml b/config/core/resources/integrationsource.yaml index a114426d248..511d7b344eb 100644 --- a/config/core/resources/integrationsource.yaml +++ b/config/core/resources/integrationsource.yaml @@ -155,16 +155,6 @@ spec: true overrides any behavior defined by the `includeBody` option. If false, the S3 object is put in the body. default: false - profileCredentialsName: - type: string - title: Profile Credentials Name - description: If using a profile credentials provider this parameter - will set the profile name. - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - a IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI @@ -232,16 +222,6 @@ spec: type: string title: Queue URL description: The full SQS Queue URL (required if using KEDA) - profileCredentialsName: - type: string - title: Profile Credentials Name - description: If using a profile credentials provider this parameter - will set the profile name. - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - a IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI @@ -306,16 +286,6 @@ spec: Note that using FROM_START can cause a significant delay before the stream has caught up to real-time. default: FROM_LATEST - profileCredentialsName: - type: string - title: Profile Credentials Name - description: If using a profile credentials provider this parameter - will set the profile name. - sessionToken: - type: string - title: Session Token - description: Amazon AWS Session Token used when the user needs to assume - an IAM role. uriEndpointOverride: type: string title: Overwrite Endpoint URI diff --git a/pkg/apis/common/integration/v1alpha1/aws.go b/pkg/apis/common/integration/v1alpha1/aws.go index 80ddb025e6e..7a77d57b52d 100644 --- a/pkg/apis/common/integration/v1alpha1/aws.go +++ b/pkg/apis/common/integration/v1alpha1/aws.go @@ -26,11 +26,9 @@ const ( type AWSCommon struct { // Auth is the S3 authentication (accessKey/secretKey) configuration. - Region string `json:"region,omitempty"` // AWS region - ProfileCredentialsName string `json:"profileCredentialsName,omitempty"` // Profile name for profile credentials provider - SessionToken string `json:"sessionToken,omitempty"` // Session token - URIEndpointOverride string `json:"uriEndpointOverride,omitempty"` // Override endpoint URI - OverrideEndpoint bool `json:"overrideEndpoint" default:"false"` // Override endpoint flag + Region string `json:"region,omitempty"` // AWS region + URIEndpointOverride string `json:"uriEndpointOverride,omitempty"` // Override endpoint URI + OverrideEndpoint bool `json:"overrideEndpoint" default:"false"` // Override endpoint flag } type AWSS3 struct {