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

registry credentials: Update default expiry and don't ignore error #467

Merged
merged 3 commits into from
Jul 21, 2020
Merged

registry credentials: Update default expiry and don't ignore error #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffd6839
Add test using the default expiry.
andrewsomething Jul 21, 2020
2c34207
Don't ignore error when calling updateExpiredDockerCredentials.
andrewsomething Jul 21, 2020
845b6a2
Set default to the new max allowed by the API.
andrewsomething Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions digitalocean/resource_digitalocean_container_registry_docker_credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
)

const expirySecondsDefault = 2147483647 // Max value of signed 32 bit integer
const expirySecondsDefault = 1576800000 // Max allowed by the API, roughly 50 years

func resourceDigitalOceanContainerRegistryDockerCredentials() *schema.Resource {
return &schema.Resource{
Expand All @@ -37,7 +37,7 @@ func resourceDigitalOceanContainerRegistryDockerCredentials() *schema.Resource {
"expiry_seconds": {
Type: schema.TypeInt,
Optional: true,
Default: expirySecondsDefault, // Relatively close to max value of Duration
Default: expirySecondsDefault,
},
"docker_credentials": {
Type: schema.TypeString,
Expand Down Expand Up @@ -73,7 +73,10 @@ func resourceDigitalOceanContainerRegistryDockerCredentialsRead(d *schema.Resour
d.Set("registry_name", reg.Name)
d.Set("write", write)

updateExpiredDockerCredentials(d, write, client)
err = updateExpiredDockerCredentials(d, write, client)
if err != nil {
return err
}

return nil
}
Expand Down
37 changes: 37 additions & 0 deletions digitalocean/resource_digitalocean_container_registry_docker_credentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,33 @@ func TestAccDigitalOceanContainerRegistryDockerCredentials_Basic(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccCheckDigitalOceanContainerRegistryDockerCredentialsConfig_basic,
Check: resource.ComposeTestCheckFunc(
testAccCheckDigitalOceanContainerRegistryDockerCredentialsExists("digitalocean_container_registry.foobar", &reg),
testAccCheckDigitalOceanContainerRegistryDockerCredentialsAttributes(&reg),
resource.TestCheckResourceAttr(
"digitalocean_container_registry_docker_credentials.foobar", "registry_name", "foobar"),
resource.TestCheckResourceAttr(
"digitalocean_container_registry_docker_credentials.foobar", "write", "true"),
resource.TestCheckResourceAttrSet(
"digitalocean_container_registry_docker_credentials.foobar", "docker_credentials"),
resource.TestCheckResourceAttrSet(
"digitalocean_container_registry_docker_credentials.foobar", "credential_expiration_time"),
),
},
},
})
}

func TestAccDigitalOceanContainerRegistryDockerCredentials_withExpiry(t *testing.T) {
var reg godo.Registry

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckDigitalOceanContainerRegistryDockerCredentialsDestroy,
Steps: []resource.TestStep{
{
Config: testAccCheckDigitalOceanContainerRegistryDockerCredentialsConfig_withExpiry,
Check: resource.ComposeTestCheckFunc(
testAccCheckDigitalOceanContainerRegistryDockerCredentialsExists("digitalocean_container_registry.foobar", &reg),
testAccCheckDigitalOceanContainerRegistryDockerCredentialsAttributes(&reg),
Expand Down Expand Up @@ -101,6 +128,16 @@ resource "digitalocean_container_registry" "foobar" {
name = "foobar"
}

resource "digitalocean_container_registry_docker_credentials" "foobar" {
registry_name = digitalocean_container_registry.foobar.name
write = true
}`

var testAccCheckDigitalOceanContainerRegistryDockerCredentialsConfig_withExpiry = `
resource "digitalocean_container_registry" "foobar" {
name = "foobar"
}

resource "digitalocean_container_registry_docker_credentials" "foobar" {
registry_name = digitalocean_container_registry.foobar.name
write = true
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/container_registry_docker_credentials.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ provider "docker" {

### Kubernetes Example

Combined with the Kubernetes Provider's `kubernetes_secret` resource, you can
Combined with the Kubernetes Provider's `kubernetes_secret` resource, you can
access the registry from inside your cluster:

```
```hcl
resource "digitalocean_container_registry_docker_credentials" "example" {
registry_name = "example"
}
Expand Down