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

feat: migrate to tf-sdk2 #102

Merged
merged 59 commits into from
Mar 18, 2021
Merged

feat: migrate to tf-sdk2 #102

Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
a991d03
chore: runs v2 upgrade cmd
mavogel Mar 8, 2021
e10e1b1
chore: moves all files into the internal provider dir
mavogel Mar 8, 2021
325ad03
chore: renames internal package from docker to provider
mavogel Dec 27, 2020
e2761c9
feat: migrates main and provider
mavogel Mar 8, 2021
27b526c
fix: migrates tests to provider factories
mavogel Dec 27, 2020
331cd6c
fix: upgrades funcs with context
mavogel Dec 27, 2020
c92b621
fix: label migration test
mavogel Dec 27, 2020
cd54dd6
fix: reg image funcs test
mavogel Dec 27, 2020
c72a236
feat: migrates to resource context aware funcs
mavogel Mar 8, 2021
ea3b5ea
fix: context propagation in resources
mavogel Mar 8, 2021
c294281
fix: adds missing ctx
mavogel Dec 28, 2020
7753bfe
chore: adapts internal provider directory path
mavogel Dec 28, 2020
251a999
fix: replace import state passthrough ctx func
mavogel Dec 28, 2020
6c227ba
fix: replace wait for state ctx
mavogel Dec 28, 2020
4c27132
fix: ignores lint check for schema.SchemaValidateFunc
mavogel Dec 29, 2020
62019c2
fix: adapts v2 path for linter errcheck settings
mavogel Dec 29, 2020
e736734
feat: adds context param to tests
mavogel Dec 29, 2020
4cbf4fc
fix: swiches registry_auth to TypeList maxItems 1
mavogel Dec 29, 2020
25fbafc
fix: switches service auth, restart_policy from Map to List
mavogel Mar 8, 2021
4566618
fix: acc test setup
mavogel Dec 29, 2020
f8dc9c0
fix: auth element from set to list parsing
mavogel Dec 29, 2020
30129eb
fix: flattener for container.HostConfig.ExtraHosts
mavogel Jan 4, 2021
cad9954
fix: adapts impl of service auth map to list switch
mavogel Jan 4, 2021
2220d5b
fix: service restart_policy map to list with one item
mavogel Jan 4, 2021
3f60dfa
fix: dockerconfig file path in tests after go files migration
mavogel Jan 4, 2021
a2903ab
fix: image context file path in tests after go files migration
mavogel Jan 4, 2021
a3fff81
fix: catch non-existing restart policy
mavogel Jan 4, 2021
e072968
chore: bumps docker to v20.10.0 and tmp fixes build
mavogel Mar 8, 2021
75bd236
fix: merge conflicts
mavogel Mar 8, 2021
b798fd6
fix: test with providerFactories
mavogel Mar 9, 2021
62714f6
fix: add docker plugin resource and datasource
mavogel Mar 9, 2021
f8fa0d4
fix: test file path for new structure
mavogel Mar 9, 2021
3020f19
fix: add name attribute eto ds docker plugin schema
mavogel Mar 9, 2021
77a2d07
test: skip image build and keep
mavogel Mar 9, 2021
b6b5c3e
chore: bump tf-sdk to v2.4.4
mavogel Mar 9, 2021
b1bd97f
fix: add stop grace period for tests of 10s
mavogel Mar 9, 2021
1bc2df7
fix: linter tmp
mavogel Mar 9, 2021
6c4f1e1
fix: acc test by adding stop grace period
mavogel Mar 9, 2021
c7b26aa
feat: set descriptions to markdown and show an example builder
mavogel Mar 11, 2021
78ee421
feat: replace first base64 encoder wirh diag func
mavogel Mar 11, 2021
0d0232d
chore: remove diag suffix from validator
mavogel Mar 13, 2021
6a107c6
fix: update validateIntegerInRange to SchemaValidateDiagFunc
mavogel Mar 13, 2021
576be5d
fix: make base64 validator return a func
mavogel Mar 13, 2021
1d7fc6e
fix: make validateIntegerGeqThan with diag
mavogel Mar 13, 2021
5444a2e
fix: remove validateFloatRatio due to unusage
mavogel Mar 13, 2021
999aeac
fix: remove validateIntegerInRange due to unusage
mavogel Mar 13, 2021
6106905
fix: make validateStringIsFloatRatio with diag
mavogel Mar 13, 2021
229e753
fix: make validateDurationGeq0 diag
mavogel Mar 13, 2021
f098d3e
fix: make validateStringMatchesPattern diag
mavogel Mar 13, 2021
27fbadd
fix: make validateDockerContainerPath diag
mavogel Mar 13, 2021
ca0c2d1
fix: validator error output format to %v
mavogel Mar 13, 2021
d867b20
fix: remove staticlink check skip for validators funcs
mavogel Mar 13, 2021
9aca4fe
test: switch from ctx TODO to Background
mavogel Mar 15, 2021
14ee44f
fix: change param of providerSetToRegistryAuth to list
mavogel Mar 15, 2021
27454eb
chore: use diags.HasError() instead of len(diags)
mavogel Mar 15, 2021
8e3d832
feat: add state upgrade for restart_policy
mavogel Mar 16, 2021
4744283
feat: add state upgrade for auth
mavogel Mar 16, 2021
41a3c79
chore: fix linting
mavogel Mar 16, 2021
ac3579e
Merge branch 'master' into feat-migrate-tf-sdk2
suzuki-shunsuke Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/provider/resource_docker_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func resourceDockerService() *schema.Resource {

Schema: map[string]*schema.Schema{
"auth": {
Type: schema.TypeMap,
Type: schema.TypeList,
Copy link
Collaborator

Choose a reason for hiding this comment

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

State Migration should be implemented.

Copy link
Collaborator

Choose a reason for hiding this comment

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

https://www.terraform.io/docs/extend/resources/state-migration.html#terraform-v0-12-sdk-state-migrations

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing out :) So for all TypeMap to TypeList we need those migrators right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  • tested locally with unit tests and
  • as described in the contributing section (I wonder how we can automate those tests)
terraform {
  required_providers {
    docker = {
      source  = "kreuzwerker/docker"
      #version = "2.8.0"
      version = "9.9.9"
    }
  }
}

provider "docker" {
}

resource "docker_image" "foo" {
  name         = "nginx:latest"
  keep_locally = true
}

resource "docker_service" "foo" {
  name = "foo"
  task_spec {
    container_spec {
      image             = docker_image.foo.latest
      stop_grace_period = "10s"
    }
    # v2.8.0
    #restart_policy = { 
    # v9.9.9
    restart_policy {
      condition    = "on-failure"
      delay        = "3s"
      max_attempts = 4
      window       = "10s"
    }

  }

  endpoint_spec {
    ports {
      target_port    = "80"
      published_port = "8080"
    }
  }
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

Great work!
Would you split files per schema version like docker_container resource?

  • resource_docker_service.go
  • resource_docker_service_v1.go
  • resource_docker_service_v0.go

I did the same in thing hashicorp/terraform-provider-docker#272 .

Optional: true,
ForceNew: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -572,8 +572,8 @@ func resourceDockerService() *schema.Resource {
},
},
"restart_policy": {
Type: schema.TypeMap,
Description: "Specification for the restart policy which applies to containers created as part of this service",
Type: schema.TypeList,
Description: "Specification for the restart policy which applies to containers created as part of this service.",
Optional: true,
Computed: true,
Elem: &schema.Resource{
Expand Down Expand Up @@ -944,7 +944,7 @@ func resourceDockerServiceV0() *schema.Resource {
// callbacks are no longer relevant
Schema: map[string]*schema.Schema{
"auth": {
Type: schema.TypeMap,
Type: schema.TypeList,
suzuki-shunsuke marked this conversation as resolved.
Show resolved Hide resolved
Optional: true,
ForceNew: true,
Elem: &schema.Resource{
Expand Down