Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(artifacts): fixes multiple http base providers #2820

Merged
merged 1 commit into from
Jul 28, 2018
Merged

fix(artifacts): fixes multiple http base providers #2820

merged 1 commit into from
Jul 28, 2018

Conversation

ethanfrogers
Copy link
Contributor

when enabling multiple http based artifact providers (http + gitlab +
github) clouddriver filed to start stating that multiple beans were
found.

@ethanfrogers
Copy link
Contributor Author

here's the error message that i saw:

***************************
APPLICATION FAILED TO START
***************************

Description:

Field gitHubOkHttpClient in com.netflix.spinnaker.clouddriver.artifacts.github.GitHubArtifactConfiguration required a single bean, but 2 were found:
    - httpOkHttpClient: defined by method 'httpOkHttpClient' in class path resource [com/netflix/spinnaker/clouddriver/artifacts/http/HttpArtifactConfiguration.class]
    - gitlabOkHttpClient: defined by method 'gitlabOkHttpClient' in class path resource [com/netflix/spinnaker/clouddriver/artifacts/gitlab/GitlabArtifactConfiguration.class]

@ethanfrogers ethanfrogers force-pushed the fix-http-based-artifacts branch from 08effcb to 17a0959 Compare July 27, 2018 19:38
@ethanfrogers
Copy link
Contributor Author

@ttomsu @lwander PTAL.

@ethanfrogers
Copy link
Contributor Author

we'll want to pull this into 1.8.x as well.

ttomsu
ttomsu reviewed Jul 27, 2018
View reviewed changes
...va/com/netflix/spinnaker/clouddriver/artifacts/bitbucket/BitbucketArtifactConfiguration.java Outdated
@@ -53,7 +53,6 @@ BitbucketArtifactProviderProperties bitbucketArtifactProviderProperties() {
@Autowired
ArtifactCredentialsRepository artifactCredentialsRepository;

@Autowired
OkHttpClient bitbucketOkHttpClient;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these fields are needed anymore, right? Across all of the ArtifactConfiguration classes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, i see! i'll pull them out.

lwander
lwander approved these changes Jul 27, 2018
View reviewed changes
Copy link
Member

@lwander lwander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice

@ethanfrogers
fix(artifacts): fixes multiple http base providers
4a53d4c 
when enabling multiple http based artifact providers (http + gitlab +
github) clouddriver filed to start stating that multiple beans were
found.
@ethanfrogers ethanfrogers force-pushed the fix-http-based-artifacts branch from 17a0959 to 4a53d4c Compare July 28, 2018 19:01
@ethanfrogers ethanfrogers merged commit 52d79d1 into spinnaker:master Jul 28, 2018
@ethanfrogers ethanfrogers deleted the fix-http-based-artifacts branch July 28, 2018 19:35
ethanfrogers added a commit to ethanfrogers/clouddriver that referenced this pull request Jul 28, 2018
@ethanfrogers
fix(artifacts): fixes multiple http base providers (spinnaker#2820)
575c300 
when enabling multiple http based artifact providers (http + gitlab +
github) clouddriver filed to start stating that multiple beans were
found.
@ethanfrogers ethanfrogers mentioned this pull request Jul 28, 2018
Merged
lwander pushed a commit that referenced this pull request Jul 29, 2018
@ethanfrogers @lwander
fix(artifacts): fixes multiple http base providers (#2820) (#2824)
e0223f4 
when enabling multiple http based artifact providers (http + gitlab +
github) clouddriver filed to start stating that multiple beans were
found.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttomsu ttomsu ttomsu left review comments

@lwander lwander lwander approved these changes

Assignees
No one assigned
Labels
target-release/1.9
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ethanfrogers @lwander @ttomsu @spinnakerbot