|
6 | 6 | "time" |
7 | 7 |
|
8 | 8 | "github.com/jfrog/jfrog-client-go/artifactory" |
9 | | - "github.com/jfrog/jfrog-client-go/artifactory/auth" |
| 9 | + artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth" |
10 | 10 | "github.com/jfrog/jfrog-client-go/artifactory/services" |
| 11 | + "github.com/jfrog/jfrog-client-go/auth" |
11 | 12 | "github.com/jfrog/jfrog-client-go/config" |
12 | 13 | "github.com/jfrog/jfrog-client-go/utils/io/content" |
13 | 14 | "golang.org/x/exp/slices" |
@@ -53,21 +54,18 @@ func (searchResult *ArtifactorySearchResultItem) HasProperty(key string) bool { |
53 | 54 | return hasProperty |
54 | 55 | } |
55 | 56 |
|
56 | | -// CreateManager creates a basic manager to interact with artifactory. |
57 | | -func (tool *ArtifactoryTool) CreateManager(baseUrl string, apiKey string) (artifactory.ArtifactoryServicesManager, error) { |
58 | | - artifactoryDetails := auth.NewArtifactoryDetails() |
59 | | - artifactoryDetails.SetUrl(baseUrl) |
| 57 | +// Creates a basic manager to interact with Artifactory using a legacy API key. |
| 58 | +func (tool *ArtifactoryTool) CreateManagerWithApiKey(baseUrl string, apiKey string) (artifactory.ArtifactoryServicesManager, error) { |
| 59 | + artifactoryDetails := createDetails(baseUrl) |
60 | 60 | artifactoryDetails.SetApiKey(apiKey) |
| 61 | + return createManagerFromAuthDetails(artifactoryDetails) |
| 62 | +} |
61 | 63 |
|
62 | | - configBuilder, err := config.NewConfigBuilder(). |
63 | | - SetServiceDetails(artifactoryDetails). |
64 | | - Build() |
65 | | - if err != nil { |
66 | | - return nil, err |
67 | | - } |
68 | | - |
69 | | - artifactoryManager, err := artifactory.New(configBuilder) |
70 | | - return artifactoryManager, err |
| 64 | +// Creates a basic manager to interact with Artifactory using an access token. |
| 65 | +func (tool *ArtifactoryTool) CreateManager(baseUrl string, accessToken string) (artifactory.ArtifactoryServicesManager, error) { |
| 66 | + artifactoryDetails := createDetails(baseUrl) |
| 67 | + artifactoryDetails.SetAccessToken(accessToken) |
| 68 | + return createManagerFromAuthDetails(artifactoryDetails) |
71 | 69 | } |
72 | 70 |
|
73 | 71 | // HasSearchResults performs the given search and returns a bool if the search contains any items or not. |
@@ -134,3 +132,24 @@ func (tool *ArtifactoryTool) GetContentFromReader(reader *content.ContentReader) |
134 | 132 | content, _ := os.ReadFile(reader.GetFilesPaths()[0]) |
135 | 133 | return string(content) |
136 | 134 | } |
| 135 | + |
| 136 | +//////////////////////////////////////////////////////////// |
| 137 | +// Internal Methods |
| 138 | +//////////////////////////////////////////////////////////// |
| 139 | + |
| 140 | +func createDetails(baseUrl string) auth.ServiceDetails { |
| 141 | + artifactoryDetails := artifactoryAuth.NewArtifactoryDetails() |
| 142 | + artifactoryDetails.SetUrl(baseUrl) |
| 143 | + return artifactoryDetails |
| 144 | +} |
| 145 | + |
| 146 | +func createManagerFromAuthDetails(artifactoryDetails auth.ServiceDetails) (artifactory.ArtifactoryServicesManager, error) { |
| 147 | + configBuilder, err := config.NewConfigBuilder(). |
| 148 | + SetServiceDetails(artifactoryDetails). |
| 149 | + Build() |
| 150 | + if err != nil { |
| 151 | + return nil, err |
| 152 | + } |
| 153 | + artifactoryManager, err := artifactory.New(configBuilder) |
| 154 | + return artifactoryManager, err |
| 155 | +} |
0 commit comments