Merge branch 'jenkinsci:master' into Github-App-Credentials

jenkinsci · Mar 9, 2022 · f950dc2 · f950dc2
2 parents 008c411 + 26bce3b
commit f950dc2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 69 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -5,7 +5,7 @@
 
 Access credentials from AWS Secrets Manager in your Jenkins jobs.
 
-This plugin is the high-level counterpart of the [AWS Secrets Manager SecretSource](https://github.com/jenkinsci/aws-secrets-manager-secret-source-plugin) plugin. It pulls in that plugin as a dependency, so by installing the CredentialsProvider on Jenkins you get the SecretSource 'for free'. This dependency will be removed in future, at which point you will need to install the SecretSource plugin separately.
+This plugin is the high-level counterpart of the [AWS Secrets Manager SecretSource](https://github.com/jenkinsci/aws-secrets-manager-secret-source-plugin) plugin. You can use either plugin individually, or use both of them.
 
 ## Contents
 
@@ -23,7 +23,7 @@ This plugin is the high-level counterpart of the [AWS Secrets Manager SecretSour
 ## Features
 
 - Read-only view of Secrets Manager.
-- `CredentialsProvider` and `SecretSource` API support.
+- `CredentialsProvider` API support.
 - Credential metadata caching (duration: 5 minutes).
 
 ## Setup

diff --git a/docs/filters/index.md b/docs/filters/index.md
@@ -14,8 +14,6 @@ Multiple filters combine with an **implicit AND** operator. Multiple values for
 
 Filters are applied server-side by Secrets Manager, and use the Amazon syntax. For full instructions on constructing filters, read the [ListSecrets API documentation](https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_ListSecrets.html).
 
-Note: The `SecretSource` implementation does not use the filters, as they are not relevant to it.
-
 ## Examples
 
 Show credentials with the tag `foo` = [any value]:

diff --git a/pom.xml b/pom.xml
@@ -77,11 +77,6 @@
             <artifactId>aws-java-sdk</artifactId>
             <version>1.12.131-302.vbef9650c6521</version>
         </dependency>
-        <dependency>
-            <groupId>io.jenkins.plugins</groupId>
-            <artifactId>aws-secrets-manager-secret-source</artifactId>
-            <version>0.0.2</version>
-        </dependency>
         <dependency>
             <groupId>io.jenkins</groupId>
             <artifactId>configuration-as-code</artifactId>

diff --git a/src/test/java/io/jenkins/plugins/credentials/secretsmanager/SecretSourceIT.java b/src/test/java/io/jenkins/plugins/credentials/secretsmanager/SecretSourceIT.java