4be327090a
Fix docker stack services command on Port output when kubernetes service is a LoadBalancer or a NodePort
...
* added tests on Kubernetes service conversion to swarm service
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: b816bde6cc
2018-03-14 11:33:42 +01:00
84628fc361
Merge pull request #934 from n4ss/refactor-trust-inspect
...
Refactor trust view command into a --pretty flag on trust inspect
Upstream-commit: 2731c71c99
2018-03-09 13:25:01 -08:00
56c837b651
Fix comment and misc code issues
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 8c3d0b93d6
2018-03-09 20:46:37 +01:00
bb8f7ed84c
Refactor trust view command into a --pretty flag on trust inspect
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: c5554f811b
2018-03-09 19:12:11 +01:00
cb331ab272
Merge pull request #929 from vdemeester/trust-no-global-var
...
Refactor content_trust cli/flags handling
Upstream-commit: 240c03a7f8
2018-03-09 11:04:09 +01:00
a895fe3327
Only read trust setting from options
...
Rename IsTrusted to ContentTrustEnabled
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: feae0e9756
2018-03-08 16:46:30 -05:00
5e391186a8
Refactor content_trust cli/flags handling
...
Remove the global variable used. Allows easier unit testing.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6e21829af4
2018-03-08 15:00:43 -05:00
925dbcac37
Merge pull request #925 from dnephin/add-build-test-symlink
...
Add a build unit test for symlinked context
Upstream-commit: 82f325ed81
2018-03-08 18:52:43 +01:00
62cc4eebd1
Merge pull request #905 from vdemeester/appveyor-setup
...
Add appveyor setup to build and unit test
Upstream-commit: 310127a7d0
2018-03-08 09:50:41 +01:00
5b9b83cf96
Add a build unit test for symlinked context
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 00b803b2d8
2018-03-07 13:04:33 -05:00
3d323d03af
Remove unused powershell function
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10baa756b2
2018-03-07 18:18:14 +01:00
39e1627a66
Fixes some unit tests to be able to run them on windows
...
Some of them are skipped for now (because the feature is not supported
or needs more work), some of them are fixed.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0cf2e6353a
2018-03-07 18:18:13 +01:00
22b79a8c67
Add appveyor setup to build and unit test
...
Adds a `make.ps1` powershell script to make it easy to compile and test.
```
.\scripts\make.ps1 -Binary
INFO: make.ps1 starting at 03/01/2018 14:37:28
INFO: Building...
________ ____ __.
\_____ \ | |/ _|
/ | \| <
/ | \ | \
\_______ /____|__ \
\/ \/
INFO: make.ps1 ended at 03/01/2018 14:37:30
.\scripts\make.ps1 -TestUnit
```
The next step is to run e2e tests on windows too.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: facb22573d
2018-03-07 18:14:10 +01:00
bd1a3c6e68
Merge pull request #921 from dnephin/use-canonical-imports
...
testing: Use canonical asserts
Upstream-commit: 0e3677ead5
2018-03-07 12:00:34 -05:00
17282c064a
Merge pull request #920 from dnephin/fix-image-build-github
...
Don't prompt for github creds in unit test
Upstream-commit: 485a01fb53
2018-03-07 14:22:52 +01:00
ac93c97ba9
Merge pull request #914 from justincormack/notaryup
...
Update Notary vendor to 0.6.0 release
Upstream-commit: f351f00f9e
2018-03-07 10:38:53 +01:00
ef941c7ad3
Convert assert.Check(t, is.Error()) to assert.Error
...
git grep -l -P '^\s+assert\.Check\(t, is\.Error\(' | \
xargs perl -pi -e 's/^(\s+assert\.)Check\(t, is\.Error\((.*)\)$/\1Error(t, \2/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e15b208e96
2018-03-06 16:00:28 -05:00
0d96772294
manual clean of asserts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f21276575f
2018-03-06 15:49:00 -05:00
b52b42c8db
Convert assert.Check with
...
git grep -l -P '^\s+assert\.Check\(t, ' | \
xargs perl -pi -e 's/^(\s+assert)\.Check(\(t, (?!is).*(\.Execute\(|\.Set\(|\.Write\(|\.Close\(|\.Untar\(|\.WriteFile\(|Validate\().*\)$)/\1.NilError\2/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 078cbc9c4b
2018-03-06 15:43:53 -05:00
dd7eb35a89
Convert to assert.NilError
...
Using:
git grep -l '^\s\+assert\.Check(t, err)$' | \
xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: baf65a5502
2018-03-06 15:27:34 -05:00
dcb7fd9dc1
dont prompt for github creds in unit test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f11a310fd
2018-03-06 15:27:09 -05:00
95d1804c11
Merge pull request #918 from dnephin/remove-testutil
...
Remove testutil
Upstream-commit: 0c75f522b6
2018-03-06 21:19:26 +01:00
6dbf483853
Remove testutil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 681c921528
2018-03-06 14:38:35 -05:00
1e7a21de7c
Merge pull request #917 from dnephin/cleanup-test-configfile
...
Don't set a default filename for ConfigFile
Upstream-commit: c969e1e0b3
2018-03-06 14:37:28 -05:00
2625498b94
Cleanup config load error handling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 789acb526c
2018-03-06 13:44:06 -05:00
a6a881dbc7
Don't set a default filename for ConfigFile
...
With a default filename tests will leave a file in the working directory
that is never cleaned up.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7c8b5708eb
2018-03-06 13:32:50 -05:00
e38d9c1064
Merge pull request #879 from dnephin/update-assertions
...
Replace testify assertions with gotestyourself/assert
Upstream-commit: a0b19f0ec2
2018-03-06 17:19:51 +01:00
bccba2fc33
Merge pull request #916 from dnephin/use-client-with-ops
...
Use new APIClient interface
Upstream-commit: fe067a0877
2018-03-06 15:01:42 +01:00
146b9fed38
Post migration fixes
...
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5155cda716
2018-03-05 19:41:17 -05:00
ad1a2c9e1d
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 39c2ca57c1
2018-03-05 19:41:17 -05:00
40f9f0a5c0
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ef8835f23
2018-03-05 19:41:14 -05:00
9ccbb57610
Update some assertions.
...
and fix some tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 93615dd967
2018-03-05 17:15:24 -05:00
d8679c544e
Use new APIClient interface
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cff874122c
2018-03-05 16:34:22 -05:00
17f0eebf06
Update Notary vendor to 0.6.0 release
...
We were on a slightly earlier random commit.
We should try to stay on releases where possible...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 9da428da2e
2018-03-02 14:56:12 +00:00
060165553c
Merge pull request #911 from vdemeester/update-gotestyourself
...
Update gotestyourself dependency
Upstream-commit: c26f37c0cc
2018-02-28 18:07:37 +01:00
c2ab7d89c3
Merge pull request #912 from kkirsche/patch-1
...
Fix grammar typo in comment
Upstream-commit: 60dcc4cdfb
2018-02-28 11:58:01 -05:00
e11e04d02b
Fix grammar typo in comment
...
Overriding is the incorrect part of speech for this sentence. It is more common to state that the values are overridden instead.
Other options would include:
```golang
// ldflags is overriding these values
```
```golang
// These values will be overridden by ldflags
```
etc.
Signed-off-by: Kevin Kirsche <kevin.kirsche@verizon.com >
Upstream-commit: 0e2fdc92ce
2018-02-28 11:29:40 -05:00
919ca49c30
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 98ba439f67
2018-02-28 16:11:02 +01:00
7c89f9b56b
Merge pull request #909 from LydellManganti/LydellManganti-patch-1
...
Update run.md --restart to include unless-stopped
Upstream-commit: c19b272c09
2018-02-28 14:53:49 +01:00
63f4daf361
Update run.md --restart to include unless-stopped
...
Update --restart option to include unless-stopped to be consistent with https://docs.docker.com/config/containers/start-containers-automatically/#use-a-restart-policy
Signed-off-by: Lydell Manganti <lydell.manganti@gmail.com >
Upstream-commit: d281b72a98
2018-02-28 21:05:30 +10:00
1d9d1d8c5e
Merge pull request #907 from dnephin/add-more-container-copy-tests
...
Add more container cp tests
Upstream-commit: c9303404d4
2018-02-28 11:12:56 +01:00
697a64b33e
Add more container cp tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 07cb69e9bc
2018-02-27 16:38:02 -05:00
be84720c48
Merge pull request #139 from shhsu/v3_credhelper
...
Silent login: use credentials from cred store to login
Upstream-commit: 2cc6ff131d
2018-02-27 19:08:53 +01:00
afdaedaad3
Merge pull request #904 from vdemeester/fix-run-label-flag-behavior
...
Fix `--label` behavior on run
Upstream-commit: a9c6c52dc0
2018-02-27 19:07:24 +01:00
37ba7892be
Merge pull request #898 from silvin-lubecki/add-stack-to-version-command
...
Print Stack API and Kubernetes versions in version command
Upstream-commit: 2851c007fe
2018-02-27 17:14:55 +01:00
70e2992847
Fix --label behavior on run
...
Commit 2b17f4c8a8vincent@sbr.pm >
Upstream-commit: 31dc5c0a9a
2018-02-27 12:14:07 +01:00
b1748ad25c
Merge pull request #893 from adshmh/add-support-for-mandatory-variables-syntax-to-stack-deploy
...
add support for mandatory variables to stack deploy
Upstream-commit: 750b038707
2018-02-27 10:25:22 +01:00
38e7824f05
fix the error message in Substitute function
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5d8ce59a25
2018-02-26 15:29:17 -05:00
bb11b4e9b1
Added error message check to TestMandatoryVariableErrors test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: e33bc48752
2018-02-26 15:29:17 -05:00
41c5444dac
Refactor substitute to reduce cyclo complexity
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ce544823b6
2018-02-26 15:29:17 -05:00
