Skip to content
This repository has been archived by the owner on Dec 11, 2020. It is now read-only.

Migrate/docker-client #70

Merged
merged 21 commits into from
Jul 3, 2018
Merged

Migrate/docker-client #70

merged 21 commits into from
Jul 3, 2018

Conversation

mavogel
Copy link
Contributor

@mavogel mavogel commented May 30, 2018

Migrate to the official docker client

datasources done:

  • registry_image

Resources done:

  • config
  • container
  • image
  • network
  • secret
  • service
  • volume

@mavogel mavogel added this to the v0.2.0 milestone May 30, 2018
@mavogel mavogel mentioned this pull request May 30, 2018
@captn3m0
Copy link
Contributor

captn3m0 commented May 30, 2018

@mavogel Trying to tackle volume to start with. Going through the diff isn't helping: is there a reference file I should look at while migrating?

Edit: Managed to migrate volume: #71 (don't write golang usually, might be weird)

@mavogel mavogel requested a review from radeksimko June 3, 2018 18:48
@mavogel mavogel self-assigned this Jun 7, 2018
@mavogel mavogel removed the request for review from radeksimko June 14, 2018 15:02
Copy link

@catsby catsby left a comment

Choose a reason for hiding this comment

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

Could you please post the results of acceptance tests run on this branch?

In general, major changes like this should only include the vendor changes and only essential changes to the code to match those vendor changes. Ideally other changes I see here (mostly cleanup from what I can see) would go in a follow up PR, to minimize the changes to just the essential parts needed for the purpose, which is the vendor client update.

That all said, I trust you so if you can show the tests pass I'll give the 👍

@mavogel
Copy link
Contributor Author

mavogel commented Jul 3, 2018

Sure @catsby. Here are the logs, straight from corresponding travis build (https://travis-ci.org/terraform-providers/terraform-provider-docker/builds/388630392):

=== RUN   TestAccDockerRegistryImage_basic
--- PASS: TestAccDockerRegistryImage_basic (3.31s)
=== RUN   TestAccDockerRegistryImage_private
--- PASS: TestAccDockerRegistryImage_private (0.99s)
=== RUN   TestAccDockerRegistryImage_auth
--- PASS: TestAccDockerRegistryImage_auth (0.25s)
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN   TestAccDockerConfig_basic
--- PASS: TestAccDockerConfig_basic (0.20s)
=== RUN   TestAccDockerConfig_basicUpdatable
--- PASS: TestAccDockerConfig_basicUpdatable (0.24s)
=== RUN   TestAccDockerContainer_basic
--- PASS: TestAccDockerContainer_basic (5.09s)
=== RUN   TestAccDockerContainerPath_validation
--- PASS: TestAccDockerContainerPath_validation (0.00s)
=== RUN   TestAccDockerContainer_volume
--- PASS: TestAccDockerContainer_volume (7.14s)
=== RUN   TestAccDockerContainer_customized
--- PASS: TestAccDockerContainer_customized (10.07s)
=== RUN   TestAccDockerContainer_upload
--- PASS: TestAccDockerContainer_upload (5.11s)
=== RUN   TestAccDockerContainer_device
--- PASS: TestAccDockerContainer_device (5.12s)
=== RUN   TestAccDockerImage_basic
--- PASS: TestAccDockerImage_basic (1.83s)
=== RUN   TestAccDockerImage_private
--- PASS: TestAccDockerImage_private (0.64s)
=== RUN   TestAccDockerImage_destroy
--- PASS: TestAccDockerImage_destroy (18.16s)
=== RUN   TestAccDockerImage_data
--- PASS: TestAccDockerImage_data (3.79s)
=== RUN   TestAccDockerImage_data_pull_trigger
--- PASS: TestAccDockerImage_data_pull_trigger (4.17s)
=== RUN   TestAccDockerImage_data_private
--- PASS: TestAccDockerImage_data_private (0.31s)
=== RUN   TestAccDockerNetwork_basic
--- PASS: TestAccDockerNetwork_basic (6.28s)
=== RUN   TestAccDockerNetwork_internal
--- PASS: TestAccDockerNetwork_internal (6.25s)
=== RUN   TestAccDockerSecret_basic
--- PASS: TestAccDockerSecret_basic (0.17s)
=== RUN   TestAccDockerSecret_basicUpdatable
--- PASS: TestAccDockerSecret_basicUpdatable (0.21s)
=== RUN   TestDockerSecretFromRegistryAuth_basic
--- PASS: TestDockerSecretFromRegistryAuth_basic (0.00s)
=== RUN   TestDockerSecretFromRegistryAuth_multiple
--- PASS: TestDockerSecretFromRegistryAuth_multiple (0.00s)
=== RUN   TestAccDockerService_minimal
--- PASS: TestAccDockerService_minimal (0.18s)
=== RUN   TestAccDockerService_full
--- PASS: TestAccDockerService_full (8.31s)
=== RUN   TestAccDockerService_partialReplicated
--- PASS: TestAccDockerService_partialReplicated (0.27s)
=== RUN   TestAccDockerService_basicGlobal
--- PASS: TestAccDockerService_basicGlobal (0.19s)
=== RUN   TestAccDockerService_GlobalAndReplicated
--- PASS: TestAccDockerService_GlobalAndReplicated (0.15s)
=== RUN   TestAccDockerService_GlobalWithConvergeConfig
--- PASS: TestAccDockerService_GlobalWithConvergeConfig (0.16s)
=== RUN   TestAccDockerService_updateImage
--- PASS: TestAccDockerService_updateImage (0.24s)
=== RUN   TestAccDockerService_updateConfigReplicasImageAndHealthIncreaseAndDecreaseReplicas
--- PASS: TestAccDockerService_updateConfigReplicasImageAndHealthIncreaseAndDecreaseReplicas (0.43s)
=== RUN   TestAccDockerService_nonExistingPrivateImageConverge
--- PASS: TestAccDockerService_nonExistingPrivateImageConverge (20.45s)
=== RUN   TestAccDockerService_nonExistingPublicImageConverge
--- PASS: TestAccDockerService_nonExistingPublicImageConverge (10.18s)
=== RUN   TestAccDockerService_basicConvergeAndStopGracefully
--- PASS: TestAccDockerService_basicConvergeAndStopGracefully (7.90s)
=== RUN   TestAccDockerService_updateFailsAndRollbackConverge
--- PASS: TestAccDockerService_updateFailsAndRollbackConverge (39.99s)
=== RUN   TestAccDockerService_updateNetworksConverge
--- PASS: TestAccDockerService_updateNetworksConverge (84.73s)
=== RUN   TestAccDockerService_updateMountsConverge
--- PASS: TestAccDockerService_updateMountsConverge (39.76s)
=== RUN   TestAccDockerService_updateHostsConverge
--- PASS: TestAccDockerService_updateHostsConverge (22.61s)
=== RUN   TestAccDockerService_updateLoggingConverge
--- PASS: TestAccDockerService_updateLoggingConverge (71.74s)
=== RUN   TestAccDockerService_updateHealthcheckConverge
--- PASS: TestAccDockerService_updateHealthcheckConverge (15.57s)
=== RUN   TestAccDockerService_updateIncreaseReplicasConverge
--- PASS: TestAccDockerService_updateIncreaseReplicasConverge (15.25s)
=== RUN   TestAccDockerService_updateDecreaseReplicasConverge
--- PASS: TestAccDockerService_updateDecreaseReplicasConverge (15.85s)
=== RUN   TestAccDockerService_updateImageConverge
--- PASS: TestAccDockerService_updateImageConverge (15.49s)
=== RUN   TestAccDockerService_updateConfigConverge
--- PASS: TestAccDockerService_updateConfigConverge (15.65s)
=== RUN   TestAccDockerService_updateConfigAndSecretConverge
--- PASS: TestAccDockerService_updateConfigAndSecretConverge (15.67s)
=== RUN   TestAccDockerService_updatePortConverge
--- PASS: TestAccDockerService_updatePortConverge (16.19s)
=== RUN   TestAccDockerService_updateConfigReplicasImageAndHealthConverge
--- PASS: TestAccDockerService_updateConfigReplicasImageAndHealthConverge (21.35s)
=== RUN   TestAccDockerService_updateConfigAndDecreaseReplicasConverge
--- PASS: TestAccDockerService_updateConfigAndDecreaseReplicasConverge (14.97s)
=== RUN   TestAccDockerService_updateConfigReplicasImageAndHealthIncreaseAndDecreaseReplicasConverge
--- PASS: TestAccDockerService_updateConfigReplicasImageAndHealthIncreaseAndDecreaseReplicasConverge (28.75s)
=== RUN   TestAccDockerService_privateConverge
--- PASS: TestAccDockerService_privateConverge (0.22s)
=== RUN   TestAccDockerVolume_basic
--- PASS: TestAccDockerVolume_basic (2.18s)
=== RUN   TestValidateIntegerInRange
--- PASS: TestValidateIntegerInRange (0.00s)
=== RUN   TestValidateIntegerGeqThan0
--- PASS: TestValidateIntegerGeqThan0 (0.00s)
=== RUN   TestValidateFloatRatio
--- PASS: TestValidateFloatRatio (0.00s)
=== RUN   TestValidateStringIsFloatRatio
--- PASS: TestValidateStringIsFloatRatio (0.00s)
=== RUN   TestValidateDurationGeq0
--- PASS: TestValidateDurationGeq0 (0.00s)
=== RUN   TestValidateStringMatchesPattern
--- PASS: TestValidateStringMatchesPattern (0.00s)
=== RUN   TestValidateStringShouldBeBase64Encoded
--- PASS: TestValidateStringShouldBeBase64Encoded (0.00s)
PASS
ok  	github.com/terraform-providers/terraform-provider-docker/docker	563.784s

Copy link

@catsby catsby left a comment

Choose a reason for hiding this comment

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

Ah yeah haha sorry I forgot TravisCI ran the full ACC tests here as well 😄 , thanks!

@mavogel mavogel merged commit 1f563cc into master Jul 3, 2018
captn3m0 pushed a commit to captn3m0/terraform-provider-docker that referenced this pull request Aug 23, 2018
Migrates to the official docker client to connect to the Docker API/Deamon. Closes hashicorp#32
@mavogel mavogel deleted the migrate/docker-client branch September 25, 2018 12:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants