Skip to content

Add driver field to top-level secret object - #1783

Merged
thaJeztah merged 3 commits into
docker:masterfrom
sirlatrom:stack_compose_secret_driver
Apr 12, 2019
Merged

Add driver field to top-level secret object#1783
thaJeztah merged 3 commits into
docker:masterfrom
sirlatrom:stack_compose_secret_driver

Conversation

@sirlatrom

@sirlatromsirlatrom commented Mar 28, 2019

Copy link
Copy Markdown
Contributor

- What I did
Added support for specifying a driver for a secret in a compose file when performing a docker stack deploy.

- How I did it
Added a driver field to the FileObjectConfig in cli/compose/types/types.go.

- How to verify it
make -f docker.Makefile binary and run the repro case in #1782.

- Description for the changelog

Added support for secret drivers in docker stack deploy

- A picture of a cute animal (not mandatory but encouraged)
image

@codecov-io

codecov-io commented Mar 28, 2019•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #1783 into master will decrease coverage by 0.04%.
The diff coverage is 25%.

@@ Coverage Diff @@## master #1783 +/- ##
==========================================
- Coverage 56.31% 56.27% -0.05% 
==========================================
Files 308 308 Lines 21391 21416 +25 ==========================================
+ Hits 12047 12051 +4 - Misses 8465 8482 +17 - Partials 879 883 +4

@sirlatrom
sirlatrom marked this pull request as ready for review March 28, 2019 14:10
@sirlatrom

sirlatrom commented Mar 28, 2019

Copy link
Copy Markdown
ContributorAuthor

I see a similar miniscule reduction in code coverage in the analogous PR #1746, so I hope that is not going to block this PR from being accepted.

@sirlatromsirlatrom mentioned this pull request Mar 28, 2019
Closed
thaJeztah
thaJeztah requested changes Mar 28, 2019
View reviewed changes

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Had a quick look at the changes, and left some comments 🤗

Comment threadcli/command/secret/create.go
Comment threadcli/compose/schema/data/config_schema_v3.8.json
Comment threadcli/compose/loader/loader.go Outdated
Comment threadcli/compose/schema/data/config_schema_v3.8.json
@sirlatrom
sirlatromforce-pushed the stack_compose_secret_driver branch from 7975b45 to 357c438CompareMarch 28, 2019 15:17
@sirlatrom

sirlatrom commented Mar 28, 2019

Copy link
Copy Markdown
ContributorAuthor

@thaJeztah I have rebased and squashed as requested, PTAL.

@thaJeztah

thaJeztah commented Apr 3, 2019

Copy link
Copy Markdown
Member

ping @silvin-lubecki@vdemeester perhaps you could have a look as well? 🤗

@thaJeztah

thaJeztah commented Apr 3, 2019

Copy link
Copy Markdown
Member

note this will conflict with #1781 (which is targeted for 19.03), this will have to be rebased, and the bindata will have to be re-generated after that is merged

@sirlatrom

sirlatrom commented Apr 3, 2019

Copy link
Copy Markdown
ContributorAuthor

note this will conflict with #1781 (which is targeted for 19.03), this will have to be rebased, and the bindata will have to be re-generated after that is merged

I'll stand by to rebase and regenerate bindata once that is merged.

@sirlatrom
Add driver and driver_opts to secret in compose schema 3.8
89f9d80
Signed-off-by: Sune Keller <absukl@almbrand.dk>
@sirlatrom
Make use of driver and driver_opts fields in secrets
c662ba0
Signed-off-by: Sune Keller <absukl@almbrand.dk>
@sirlatrom
Add test case
ed838bf
Signed-off-by: Sune Keller <absukl@almbrand.dk>
@sirlatrom
sirlatromforce-pushed the stack_compose_secret_driver branch from 357c438 to ed838bfCompareApril 5, 2019 10:01
thaJeztah
thaJeztah approved these changes Apr 5, 2019
View reviewed changes

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

ping @vdemeester@tiborvass@silvin-lubecki

vdemeester
vdemeester approved these changes Apr 5, 2019
View reviewed changes

@vdemeestervdemeester left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM 🐯

@sirlatrom

sirlatrom commented Apr 5, 2019

Copy link
Copy Markdown
ContributorAuthor

@thaJeztah Since #1781 is not merged yet, I assume the regenerating of bindata will happen in that PR?

@thaJeztah

thaJeztah commented Apr 12, 2019

Copy link
Copy Markdown
Member

Spoke with @dperny and he's ok doing a rebase/regenerate of the spec, so let's merge 🎉

@thaJeztah
thaJeztah merged commit 8b9cdab into docker:masterApr 12, 2019
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Apr 12, 2019
@sirlatrom
sirlatrom deleted the stack_compose_secret_driver branch April 12, 2019 16:16
@thaJeztahthaJeztah mentioned this pull request Jun 10, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztahthaJeztahthaJeztah approved these changes
+1 more reviewer
@vdemeestervdemeestervdemeester approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

impact/changelogimpact/compose-filestatus/2-code-review

Projects

None yet

Milestone

19.03.0

Development

Successfully merging this pull request may close these issues.

5 participants

@sirlatrom@codecov-io@thaJeztah@vdemeester@GordonTheTurtle