From 3760d4890040c3de75c0b0c1cb12b2f6d224368c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lapeyre?= Date: Wed, 16 Jun 2021 13:11:39 +0200 Subject: [PATCH 1/4] Upgrade to Terraform SDK v2 --- go.mod | 2 +- go.sum | 172 +++++++-------------- main.go | 8 +- nomad/data_source_acl_policies.go | 4 +- nomad/data_source_acl_policies_test.go | 4 +- nomad/data_source_acl_policy.go | 2 +- nomad/data_source_acl_policy_test.go | 6 +- nomad/data_source_acl_token.go | 2 +- nomad/data_source_acl_token_test.go | 4 +- nomad/data_source_acl_tokens.go | 2 +- nomad/data_source_acl_tokens_test.go | 2 +- nomad/data_source_datacenters.go | 4 +- nomad/data_source_datacenters_test.go | 2 +- nomad/data_source_deployments.go | 2 +- nomad/data_source_deployments_test.go | 4 +- nomad/data_source_job_parser.go | 2 +- nomad/data_source_job_parser_test.go | 4 +- nomad/data_source_namespace.go | 2 +- nomad/data_source_namespace_test.go | 2 +- nomad/data_source_namespaces.go | 2 +- nomad/data_source_namespaces_test.go | 4 +- nomad/data_source_plugins.go | 4 +- nomad/data_source_regions.go | 2 +- nomad/data_source_regions_test.go | 4 +- nomad/data_source_scaling_policies.go | 4 +- nomad/data_source_scaling_policies_test.go | 2 +- nomad/data_source_scaling_policy.go | 2 +- nomad/data_source_scaling_policy_test.go | 2 +- nomad/data_source_scheduler_config.go | 4 +- nomad/data_source_volumes.go | 4 +- nomad/datasource_nomad_job.go | 2 +- nomad/datasource_nomad_job_test.go | 4 +- nomad/datasource_nomad_plugin.go | 4 +- nomad/helper/state_writer.go | 2 +- nomad/provider.go | 2 +- nomad/provider_test.go | 21 +-- nomad/resource_acl_policy.go | 2 +- nomad/resource_acl_policy_test.go | 6 +- nomad/resource_acl_token.go | 2 +- nomad/resource_acl_token_test.go | 4 +- nomad/resource_external_volume.go | 4 +- nomad/resource_job.go | 7 +- nomad/resource_job_test.go | 8 +- nomad/resource_namespace.go | 2 +- nomad/resource_namespace_test.go | 6 +- nomad/resource_quota_specification.go | 2 +- nomad/resource_quota_specification_test.go | 6 +- nomad/resource_scheduler_config.go | 4 +- nomad/resource_scheduler_config_test.go | 4 +- nomad/resource_sentinel_policy.go | 4 +- nomad/resource_sentinel_policy_test.go | 6 +- nomad/resource_volume.go | 7 +- 52 files changed, 161 insertions(+), 212 deletions(-) diff --git a/go.mod b/go.mod index 5d71ccac..0508f635 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/nomad v1.1.0 github.com/hashicorp/nomad/api v0.0.0-20210517202321-f99f1e27bb66 - github.com/hashicorp/terraform-plugin-sdk v1.17.2 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 github.com/hashicorp/vault v0.10.4 github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 031028b6..f8ce667c 100644 --- a/go.sum +++ b/go.sum @@ -12,9 +12,8 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.61.0 h1:NLQf5e1OMspfNT1RAHOB3ublr1TW3YTXO8OiWwVjK2U= +cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -68,18 +67,9 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5/go.mod h1:nxQPcNPR/34g+HcK2hEsF99O+GJgIkW/OmPl8wtzhmk= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= -github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.4.3/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= github.com/Microsoft/hcsshim v0.8.8-0.20200312192636-fd0797d766b1/go.mod h1:LVvUcNYEzt59fFVTuiPEgM6dgF70yMGdy/Qc/UmCbuU= github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20180829222009-86f2a9fac6c5/go.mod h1:nMOvShGpWaf0bXwXmeu4k+O4uziuaEI8pWzIj3BUrOA= @@ -102,9 +92,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= -github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFUye+ZcSR6opIgz9Co7WcDx6ZcY+RjfFHoA0I= github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= @@ -124,8 +113,8 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= +github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.41/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.20 h1:QbzNx/tdfATbdKfubBpkt84OM6oBkxQZRw6+bW2GyeA= github.com/aws/aws-sdk-go v1.38.20/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -243,12 +232,11 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.1.0 h1:4pl5BV4o7ZG/lterP4S6WzJ6xr49Ba5ET9ygheTYahk= -github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= -github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc= -github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= +github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEssk= +github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -290,8 +278,6 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -318,7 +304,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -338,9 +323,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -379,27 +363,29 @@ github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod h1: github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-connlimit v0.2.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0= github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0= +github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= +github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 h1:kgvybwEeu0SXktbB2y3uLHX9lklLo+nzUwh59A3jzQc= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840/go.mod h1:Abjk0jbRkDaNCzsRhOv2iDCofYpX1eVsjozoiK63qLA= github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod h1:NnH5X4UCBEBdTuK2L8s4e4ilJm3UmGX0bANHCz0HSs0= github.com/hashicorp/go-discover v0.0.0-20200812215701-c4b85f6ed31f/go.mod h1:D4eo8/CN92vm9/9UDG+ldX1/fMFa4kpl8qzyTolus8o= github.com/hashicorp/go-envparse v0.0.0-20180119215841-310ca1881b22/go.mod h1:/NlxCzN2D4C4L2uDE6ux/h6jM+n98VFQM14nnCIfHJU= github.com/hashicorp/go-gatedio v0.5.0/go.mod h1:Lr3t8L6IyxD3DAeaUxGcgl2JnRUpWMCsmBl4Omu/2t4= +github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= +github.com/hashicorp/go-getter v1.5.0/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= +github.com/hashicorp/go-getter v1.5.2 h1:XDo8LiAcDisiqZdv0TKgz+HtX3WN7zA2JD1R1tjsabE= github.com/hashicorp/go-getter v1.5.2/go.mod h1:orNH3BTYLu/fIxGIdLjLoAJHWMDQ/UKQr5O4m3iBuoo= -github.com/hashicorp/go-getter v1.5.3 h1:NF5+zOlQegim+w/EUhSLh6QhXHmZMEeHLQzllkQ3ROU= -github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v0.15.0 h1:qMuK0wxsoW4D0ddCCYwPSTm4KQv1X1ke3WmPWZ0Mvsk= +github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -434,8 +420,8 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1-0.20191009193637-2046c9d0f0b0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= @@ -444,12 +430,10 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee h1:8B4HqvMUtYSjsGkYjiQGStc9pXffY2J+Z2SPQAj+wMY= github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee/go.mod h1:gwlu9+/P9MmKtYrMsHeFRZPXj2CTPm11TDnMeaRHS7g= -github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= -github.com/hashicorp/hcl/v2 v2.8.2/go.mod h1:bQTN5mpo+jewjJgh8jr0JUguIi7qPHUF6yIfAEN3jqY= +github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc h1:x0m+f0NSbNCz1z+mkBiD3MIThn3OJ8elHtF7pCMvyJ8= github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod h1:KHvg/R2/dPtaePb16oW4qIyzkMxXOL38xjRN64adsts= @@ -475,18 +459,14 @@ github.com/hashicorp/serf v0.8.3/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc github.com/hashicorp/serf v0.9.3/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 h1:Pc5TCv9mbxFN6UVX0LH6CpQrdTM5YjbVI2w15237Pjk= -github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A= -github.com/hashicorp/terraform-exec v0.13.3 h1:R6L2mNpDGSEqtLrSONN8Xth0xYwNrnEVzDz6LF/oJPk= -github.com/hashicorp/terraform-exec v0.13.3/go.mod h1:SSg6lbUsVB3DmFyCPjBPklqf6EYGX0TlQ6QTxOlikDU= -github.com/hashicorp/terraform-json v0.10.0 h1:9syPD/Y5t+3uFjG8AiWVPu1bklJD8QB8iTCaJASc8oQ= -github.com/hashicorp/terraform-json v0.10.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= -github.com/hashicorp/terraform-plugin-sdk v1.17.2 h1:V7DUR3yBWFrVB9z3ddpY7kiYVSsq4NYR67NiTs93NQo= -github.com/hashicorp/terraform-plugin-sdk v1.17.2/go.mod h1:wkvldbraEMkz23NxkkAsFS88A1R9eUiooiaUZyS6TLw= -github.com/hashicorp/terraform-plugin-test/v2 v2.2.1 h1:d3Rzmi5bnRzcAZon91FY4TDCMUYdU8c5vpPpf2Tz+c8= -github.com/hashicorp/terraform-plugin-test/v2 v2.2.1/go.mod h1:eZ9JL3O69Cb71Skn6OhHyj17sLmHRb+H6VrDcJjKrYU= -github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= -github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= +github.com/hashicorp/terraform-exec v0.13.0 h1:1Pth+pdWJAufJuWWjaVOVNEkoRTOjGn3hQpAqj4aPdg= +github.com/hashicorp/terraform-exec v0.13.0/go.mod h1:SGhto91bVRlgXQWcJ5znSz+29UZIa8kpBbkGwQ+g9E8= +github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8ebSW0vztc= +github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= +github.com/hashicorp/terraform-plugin-go v0.2.1 h1:EW/R8bB2Zbkjmugzsy1d27yS8/0454b3MtYHkzOknqA= +github.com/hashicorp/terraform-plugin-go v0.2.1/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 h1:DGnxpIYRHXQZb2TOlQ1OCEYxoRQrAcbLIcYm8kvbFuU= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3/go.mod h1:5wrrTcxbSaQXamCDbHZTHk6yTF9OEZaOvQ9fvLXBE3o= github.com/hashicorp/vault v0.10.4 h1:4x0lHxui/ZRp/B3E0Auv1QNBJpzETqHR2kQD3mHSBJU= github.com/hashicorp/vault v0.10.4/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= @@ -499,21 +479,18 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= -github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -535,8 +512,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= -github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -546,9 +523,8 @@ github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -568,13 +544,11 @@ github.com/linode/linodego v0.7.1/go.mod h1:ga11n3ivecUrPCHN0rANxKmfWBJVkOXfLMZi github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= @@ -588,11 +562,9 @@ github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/cli v1.1.2 h1:PvH+lL2B7IQ101xQL63Of8yFS2y+aDlsFcsqNc+u/Kw= -github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= +github.com/mitchellh/cli v1.1.1 h1:J64v/xD7Clql+JVKSvkYojLOXu1ibnY9ZjGLwSt/89w= +github.com/mitchellh/cli v1.1.1/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -633,7 +605,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758= +github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 h1:R9vmquWCeGmxTHUVnTQJrU4oPlgEn9+x48nwXSqkIKg= github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= @@ -671,7 +646,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E= github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -708,9 +682,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.2/go.mod h1:ghfMypLDrFSWN2c9cDYFLHyynQ+QUht0cv/18ZqVczw= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= @@ -727,7 +700,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1 github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod h1:Cw4GTlQccdRGSEf6KiMju767x0NEHE0YIVPJSaXjlsw= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -755,40 +727,37 @@ github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITn github.com/tklauser/numcpus v0.2.1/go.mod h1:9aU+wOc6WjUIZEwWMP62PL/41d65P+iks1gBkr4QyP8= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/vmihailenco/msgpack v3.3.3+incompatible h1:wapg9xDUZDzGCNFlwc5SqI1rvcciqcxEHac4CYj89xI= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= -github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= +github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= +github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= -github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= -github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= -github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= -github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= github.com/zclconf/go-cty v1.4.0/go.mod h1:nHzOclRkoj++EU9ZjSrZvRG0BXIWt8c7loYc0qXAFGQ= +github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= -github.com/zclconf/go-cty v1.8.2 h1:u+xZfBKgpycDnTNjPhGiTEYZS5qS/Sb5MqSfm7vzcjg= -github.com/zclconf/go-cty v1.8.2/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= github.com/zclconf/go-cty-yaml v1.0.2 h1:dNyg4QLTrv2IfJpm7Wtxi55ed5gLGOlPrZ6kMd51hY0= github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0= @@ -817,11 +786,10 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -878,7 +846,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -892,21 +859,16 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs= -golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -915,7 +877,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -926,6 +887,7 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -967,18 +929,13 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHjJYiktO7QnJC5ut7iY4= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1038,17 +995,12 @@ golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb h1:KVWk3RW1AZlxWum4tYqegLgwJHb5oouozcGM8HfNQaw= -golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed h1:+qzWo37K31KxduIYaBeMqJ8MUOyTayOQKpH9aDPLMSY= +golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -1065,10 +1017,8 @@ google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/ google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.34.0 h1:k40adF3uR+6x/+hO5Dh4ZFUqFp67vxvbpafFiJxl10A= -google.golang.org/api v0.34.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1106,11 +1056,8 @@ google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d h1:92D1fum1bJLKSdr11OJ+54YeCMCGYIygTA7R/YZxH5M= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200711021454-869866162049 h1:YFTFpQhgvrLrmxtiIncJxFXeCyq84ixuKWVCaCAi9Oc= +google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1127,8 +1074,6 @@ google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1149,9 +1094,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/main.go b/main.go index 3c2b1169..400dc235 100644 --- a/main.go +++ b/main.go @@ -1,14 +1,16 @@ package main import ( - "github.com/hashicorp/terraform-plugin-sdk/plugin" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" "github.com/hashicorp/terraform-provider-nomad/nomad" ) func main() { plugin.Serve(&plugin.ServeOpts{ - ProviderFunc: func() terraform.ResourceProvider { return nomad.Provider() }, + ProviderFunc: func() *schema.Provider { + return nomad.Provider() + }, }) } diff --git a/nomad/data_source_acl_policies.go b/nomad/data_source_acl_policies.go index ee399a76..bd340e6e 100644 --- a/nomad/data_source_acl_policies.go +++ b/nomad/data_source_acl_policies.go @@ -5,8 +5,8 @@ import ( "log" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceAclPolicies() *schema.Resource { diff --git a/nomad/data_source_acl_policies_test.go b/nomad/data_source_acl_policies_test.go index 609af5cb..fac3182a 100644 --- a/nomad/data_source_acl_policies_test.go +++ b/nomad/data_source_acl_policies_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccDataSourceNomadAclPolicies_Basic(t *testing.T) { diff --git a/nomad/data_source_acl_policy.go b/nomad/data_source_acl_policy.go index 00b34c4f..190989fe 100644 --- a/nomad/data_source_acl_policy.go +++ b/nomad/data_source_acl_policy.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceAclPolicy() *schema.Resource { diff --git a/nomad/data_source_acl_policy_test.go b/nomad/data_source_acl_policy_test.go index 00f6a7b3..d8bb8d6d 100644 --- a/nomad/data_source_acl_policy_test.go +++ b/nomad/data_source_acl_policy_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccDataSourceNomadAclPolicy_Basic(t *testing.T) { diff --git a/nomad/data_source_acl_token.go b/nomad/data_source_acl_token.go index 3224b8ef..6bd2fbbd 100644 --- a/nomad/data_source_acl_token.go +++ b/nomad/data_source_acl_token.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceACLToken() *schema.Resource { diff --git a/nomad/data_source_acl_token_test.go b/nomad/data_source_acl_token_test.go index 76a1048d..a528ef60 100644 --- a/nomad/data_source_acl_token_test.go +++ b/nomad/data_source_acl_token_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestDataSourceACLToken_Basic(t *testing.T) { diff --git a/nomad/data_source_acl_tokens.go b/nomad/data_source_acl_tokens.go index 3d1e972d..afda523b 100644 --- a/nomad/data_source_acl_tokens.go +++ b/nomad/data_source_acl_tokens.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceACLTokens() *schema.Resource { diff --git a/nomad/data_source_acl_tokens_test.go b/nomad/data_source_acl_tokens_test.go index 94710479..aae640ac 100644 --- a/nomad/data_source_acl_tokens_test.go +++ b/nomad/data_source_acl_tokens_test.go @@ -3,7 +3,7 @@ package nomad import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestDataSourceACLTokens_Basic(t *testing.T) { diff --git a/nomad/data_source_datacenters.go b/nomad/data_source_datacenters.go index 0ecf4c4e..cea84e6e 100644 --- a/nomad/data_source_datacenters.go +++ b/nomad/data_source_datacenters.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceDatacenters() *schema.Resource { diff --git a/nomad/data_source_datacenters_test.go b/nomad/data_source_datacenters_test.go index 76960657..012f2536 100644 --- a/nomad/data_source_datacenters_test.go +++ b/nomad/data_source_datacenters_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestAccDataSourceDatacenters_Basic(t *testing.T) { diff --git a/nomad/data_source_deployments.go b/nomad/data_source_deployments.go index 95834f69..a9aab196 100644 --- a/nomad/data_source_deployments.go +++ b/nomad/data_source_deployments.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceDeployments() *schema.Resource { diff --git a/nomad/data_source_deployments_test.go b/nomad/data_source_deployments_test.go index 2a2713d0..0a2cb59f 100644 --- a/nomad/data_source_deployments_test.go +++ b/nomad/data_source_deployments_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) // Test will diff --git a/nomad/data_source_job_parser.go b/nomad/data_source_job_parser.go index 386d7387..61883b3e 100644 --- a/nomad/data_source_job_parser.go +++ b/nomad/data_source_job_parser.go @@ -6,7 +6,7 @@ import ( "log" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceJobParser() *schema.Resource { diff --git a/nomad/data_source_job_parser_test.go b/nomad/data_source_job_parser_test.go index 8dbaff5b..179a87c7 100644 --- a/nomad/data_source_job_parser_test.go +++ b/nomad/data_source_job_parser_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccDataSourceNomadJobParser_Basic(t *testing.T) { diff --git a/nomad/data_source_namespace.go b/nomad/data_source_namespace.go index 65469f2a..4f82bc5b 100644 --- a/nomad/data_source_namespace.go +++ b/nomad/data_source_namespace.go @@ -3,7 +3,7 @@ package nomad import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceNamespace() *schema.Resource { diff --git a/nomad/data_source_namespace_test.go b/nomad/data_source_namespace_test.go index d784fd35..9b3dd5bb 100644 --- a/nomad/data_source_namespace_test.go +++ b/nomad/data_source_namespace_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestDataSourceNamespace(t *testing.T) { diff --git a/nomad/data_source_namespaces.go b/nomad/data_source_namespaces.go index 2bfea124..dddfd426 100644 --- a/nomad/data_source_namespaces.go +++ b/nomad/data_source_namespaces.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceNamespaces() *schema.Resource { diff --git a/nomad/data_source_namespaces_test.go b/nomad/data_source_namespaces_test.go index 3eae38cc..d61507ac 100644 --- a/nomad/data_source_namespaces_test.go +++ b/nomad/data_source_namespaces_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestDataSourceNamespaces(t *testing.T) { diff --git a/nomad/data_source_plugins.go b/nomad/data_source_plugins.go index 54a5fd63..d0f2bd17 100644 --- a/nomad/data_source_plugins.go +++ b/nomad/data_source_plugins.go @@ -5,8 +5,8 @@ import ( "log" "strconv" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func dataSourcePlugins() *schema.Resource { diff --git a/nomad/data_source_regions.go b/nomad/data_source_regions.go index 860cb899..a24d6645 100644 --- a/nomad/data_source_regions.go +++ b/nomad/data_source_regions.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceRegions() *schema.Resource { diff --git a/nomad/data_source_regions_test.go b/nomad/data_source_regions_test.go index 62d7e754..92103152 100644 --- a/nomad/data_source_regions_test.go +++ b/nomad/data_source_regions_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestDataSourceRegions(t *testing.T) { diff --git a/nomad/data_source_scaling_policies.go b/nomad/data_source_scaling_policies.go index a3849668..1c7d3afc 100644 --- a/nomad/data_source_scaling_policies.go +++ b/nomad/data_source_scaling_policies.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceScalingPolicies() *schema.Resource { diff --git a/nomad/data_source_scaling_policies_test.go b/nomad/data_source_scaling_policies_test.go index 13a1491d..371d15c9 100644 --- a/nomad/data_source_scaling_policies_test.go +++ b/nomad/data_source_scaling_policies_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestDataSourceScalingPolicies_Basic(t *testing.T) { diff --git a/nomad/data_source_scaling_policy.go b/nomad/data_source_scaling_policy.go index 5acda9e5..92cc7db6 100644 --- a/nomad/data_source_scaling_policy.go +++ b/nomad/data_source_scaling_policy.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-nomad/nomad/helper" ) diff --git a/nomad/data_source_scaling_policy_test.go b/nomad/data_source_scaling_policy_test.go index 12bd63de..13c6469b 100644 --- a/nomad/data_source_scaling_policy_test.go +++ b/nomad/data_source_scaling_policy_test.go @@ -3,7 +3,7 @@ package nomad import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) func TestDataSourceScalingPolicy_Basic(t *testing.T) { diff --git a/nomad/data_source_scheduler_config.go b/nomad/data_source_scheduler_config.go index c48eea76..d895bfcd 100644 --- a/nomad/data_source_scheduler_config.go +++ b/nomad/data_source_scheduler_config.go @@ -3,8 +3,8 @@ package nomad import ( "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-nomad/nomad/helper" ) diff --git a/nomad/data_source_volumes.go b/nomad/data_source_volumes.go index e672e0d9..60d46ba8 100644 --- a/nomad/data_source_volumes.go +++ b/nomad/data_source_volumes.go @@ -6,8 +6,8 @@ import ( "strconv" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func dataSourceVolumes() *schema.Resource { diff --git a/nomad/datasource_nomad_job.go b/nomad/datasource_nomad_job.go index a006c924..efcfbee0 100644 --- a/nomad/datasource_nomad_job.go +++ b/nomad/datasource_nomad_job.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceJob() *schema.Resource { diff --git a/nomad/datasource_nomad_job_test.go b/nomad/datasource_nomad_job_test.go index 0a8d10dd..2ab06bf0 100644 --- a/nomad/datasource_nomad_job_test.go +++ b/nomad/datasource_nomad_job_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestAccDataSourceNomadJob_Basic(t *testing.T) { diff --git a/nomad/datasource_nomad_plugin.go b/nomad/datasource_nomad_plugin.go index 27948d05..cbe25ed2 100644 --- a/nomad/datasource_nomad_plugin.go +++ b/nomad/datasource_nomad_plugin.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourcePlugin() *schema.Resource { diff --git a/nomad/helper/state_writer.go b/nomad/helper/state_writer.go index 30e51152..1654ab43 100644 --- a/nomad/helper/state_writer.go +++ b/nomad/helper/state_writer.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) type StateWriter struct { diff --git a/nomad/provider.go b/nomad/provider.go index d5b1bb3a..e39f0e74 100644 --- a/nomad/provider.go +++ b/nomad/provider.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/vault/command/config" ) diff --git a/nomad/provider_test.go b/nomad/provider_test.go index e585ed4f..57c42b77 100644 --- a/nomad/provider_test.go +++ b/nomad/provider_test.go @@ -1,6 +1,7 @@ package nomad import ( + "context" "fmt" "net/http" "os" @@ -9,9 +10,9 @@ import ( "testing" "github.com/hashicorp/go-version" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) // How to run the acceptance tests for this provider: @@ -39,15 +40,15 @@ func TestProvider(t *testing.T) { } func TestProvider_impl(t *testing.T) { - var _ terraform.ResourceProvider = Provider() + var _ *schema.Provider = Provider() } var testProvider *schema.Provider -var testProviders map[string]terraform.ResourceProvider +var testProviders map[string]*schema.Provider func init() { testProvider = Provider() - testProviders = map[string]terraform.ResourceProvider{ + testProviders = map[string]*schema.Provider{ "nomad": testProvider, } } @@ -57,7 +58,7 @@ func testAccPreCheck(t *testing.T) { os.Setenv("NOMAD_ADDR", "http://127.0.0.1:4646") } - err := testProvider.Configure(terraform.NewResourceConfigRaw(nil)) + err := testProvider.Configure(context.Background(), terraform.NewResourceConfigRaw(nil)) if err != nil { t.Fatal(err) } @@ -283,10 +284,10 @@ func testAccCheckNomadProviderConfigConsulToken(provider *schema.Provider) resou // This should only be used for TestAccNomadProvider_ tests which need to // reference the provider instance itself. Other testing should use // testAccProviderFactories or other related functions. -func testAccProviderFactoryInternal(provider **schema.Provider) map[string]terraform.ResourceProviderFactory { +func testAccProviderFactoryInternal(provider **schema.Provider) map[string]func() (*schema.Provider, error) { p := Provider() - factories := map[string]terraform.ResourceProviderFactory{ - "nomad": func() (terraform.ResourceProvider, error) { + factories := map[string]func() (*schema.Provider, error){ + "nomad": func() (*schema.Provider, error) { return p, nil }, } diff --git a/nomad/resource_acl_policy.go b/nomad/resource_acl_policy.go index 0656dc6e..da2930a8 100644 --- a/nomad/resource_acl_policy.go +++ b/nomad/resource_acl_policy.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceACLPolicy() *schema.Resource { diff --git a/nomad/resource_acl_policy_test.go b/nomad/resource_acl_policy_test.go index 91698db1..b54e6fe2 100644 --- a/nomad/resource_acl_policy_test.go +++ b/nomad/resource_acl_policy_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestResourceACLPolicy_import(t *testing.T) { diff --git a/nomad/resource_acl_token.go b/nomad/resource_acl_token.go index 5164f179..f446f15e 100644 --- a/nomad/resource_acl_token.go +++ b/nomad/resource_acl_token.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceACLToken() *schema.Resource { diff --git a/nomad/resource_acl_token_test.go b/nomad/resource_acl_token_test.go index ed25819a..bc29b246 100644 --- a/nomad/resource_acl_token_test.go +++ b/nomad/resource_acl_token_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestResourceACLToken_import(t *testing.T) { diff --git a/nomad/resource_external_volume.go b/nomad/resource_external_volume.go index 5a5ac02d..3999b126 100644 --- a/nomad/resource_external_volume.go +++ b/nomad/resource_external_volume.go @@ -9,8 +9,8 @@ import ( "github.com/dustin/go-humanize" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceExternalVolume() *schema.Resource { diff --git a/nomad/resource_job.go b/nomad/resource_job.go index 1cd37a0d..120d9cbc 100644 --- a/nomad/resource_job.go +++ b/nomad/resource_job.go @@ -1,6 +1,7 @@ package nomad import ( + "context" "encoding/json" "fmt" "log" @@ -13,8 +14,8 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/jobspec" "github.com/hashicorp/nomad/jobspec2" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceJob() *schema.Resource { @@ -558,7 +559,7 @@ func resourceJobRead(d *schema.ResourceData, meta interface{}) error { return nil } -func resourceJobCustomizeDiff(d *schema.ResourceDiff, meta interface{}) error { +func resourceJobCustomizeDiff(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { log.Printf("[DEBUG] resourceJobCustomizeDiff") providerConfig := meta.(ProviderConfig) client := providerConfig.client diff --git a/nomad/resource_job_test.go b/nomad/resource_job_test.go index 940af70a..59aa66a3 100644 --- a/nomad/resource_job_test.go +++ b/nomad/resource_job_test.go @@ -19,11 +19,11 @@ import ( "github.com/hashicorp/nomad/api" "github.com/hashicorp/nomad/helper" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - r "github.com/hashicorp/terraform-plugin-sdk/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + r "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestResourceJob_basic(t *testing.T) { diff --git a/nomad/resource_namespace.go b/nomad/resource_namespace.go index 00b8c318..61037170 100644 --- a/nomad/resource_namespace.go +++ b/nomad/resource_namespace.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceNamespace() *schema.Resource { diff --git a/nomad/resource_namespace_test.go b/nomad/resource_namespace_test.go index a9e214bc..3422efe6 100644 --- a/nomad/resource_namespace_test.go +++ b/nomad/resource_namespace_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestResourceNamespace_import(t *testing.T) { diff --git a/nomad/resource_quota_specification.go b/nomad/resource_quota_specification.go index 982841fe..86275ece 100644 --- a/nomad/resource_quota_specification.go +++ b/nomad/resource_quota_specification.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func resourceQuotaSpecification() *schema.Resource { diff --git a/nomad/resource_quota_specification_test.go b/nomad/resource_quota_specification_test.go index df9b8f70..3f84300b 100644 --- a/nomad/resource_quota_specification_test.go +++ b/nomad/resource_quota_specification_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/hashicorp/nomad/api" ) diff --git a/nomad/resource_scheduler_config.go b/nomad/resource_scheduler_config.go index fabe0d1d..63d3efcc 100644 --- a/nomad/resource_scheduler_config.go +++ b/nomad/resource_scheduler_config.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceSchedulerConfig() *schema.Resource { diff --git a/nomad/resource_scheduler_config_test.go b/nomad/resource_scheduler_config_test.go index 3b3cae10..3bd75e23 100644 --- a/nomad/resource_scheduler_config_test.go +++ b/nomad/resource_scheduler_config_test.go @@ -3,8 +3,8 @@ package nomad import ( "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestSchedulerConfig_basic(t *testing.T) { diff --git a/nomad/resource_sentinel_policy.go b/nomad/resource_sentinel_policy.go index 89d31748..211a6511 100644 --- a/nomad/resource_sentinel_policy.go +++ b/nomad/resource_sentinel_policy.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceSentinelPolicy() *schema.Resource { diff --git a/nomad/resource_sentinel_policy_test.go b/nomad/resource_sentinel_policy_test.go index f9ea446d..c4ccfb13 100644 --- a/nomad/resource_sentinel_policy_test.go +++ b/nomad/resource_sentinel_policy_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) func TestResourceSentinelPolicy_import(t *testing.T) { diff --git a/nomad/resource_volume.go b/nomad/resource_volume.go index 4ea73ef8..5702e8ec 100644 --- a/nomad/resource_volume.go +++ b/nomad/resource_volume.go @@ -2,6 +2,7 @@ package nomad import ( "bytes" + "context" "errors" "fmt" "hash/crc32" @@ -9,8 +10,8 @@ import ( "strings" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" ) func resourceVolume() *schema.Resource { @@ -472,7 +473,7 @@ func parseVolumeCapabilities(i interface{}) ([]*api.CSIVolumeCapability, error) } // resourceVolumeStateUpgradeV0 migrates a nomad_volume resource schema from v0 to v1. -func resourceVolumeStateUpgradeV0(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { +func resourceVolumeStateUpgradeV0(_ context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { if val, ok := rawState["mount_options"]; ok { rawState["mount_options"] = []interface{}{val} } From ce21845eb3b5007074b72e47be5dcdb5825d8ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lapeyre?= Date: Wed, 16 Jun 2021 13:11:47 +0200 Subject: [PATCH 2/4] Add terraform-plugin-mux --- go.mod | 2 ++ go.sum | 11 +++++++++++ main.go | 21 +++++++++++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 0508f635..ddd26637 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,8 @@ require ( github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/nomad v1.1.0 github.com/hashicorp/nomad/api v0.0.0-20210517202321-f99f1e27bb66 + github.com/hashicorp/terraform-plugin-go v0.2.1 + github.com/hashicorp/terraform-plugin-mux v0.1.1 github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 github.com/hashicorp/vault v0.10.4 github.com/mitchellh/mapstructure v1.4.1 // indirect diff --git a/go.sum b/go.sum index f8ce667c..87da62bf 100644 --- a/go.sum +++ b/go.sum @@ -459,12 +459,23 @@ github.com/hashicorp/serf v0.8.3/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc github.com/hashicorp/serf v0.9.3/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/terraform-exec v0.12.0 h1:Tb1VC2gqArl9EJziJjoazep2MyxMk00tnNKV/rgMba0= +github.com/hashicorp/terraform-exec v0.12.0/go.mod h1:SGhto91bVRlgXQWcJ5znSz+29UZIa8kpBbkGwQ+g9E8= github.com/hashicorp/terraform-exec v0.13.0 h1:1Pth+pdWJAufJuWWjaVOVNEkoRTOjGn3hQpAqj4aPdg= github.com/hashicorp/terraform-exec v0.13.0/go.mod h1:SGhto91bVRlgXQWcJ5znSz+29UZIa8kpBbkGwQ+g9E8= github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8ebSW0vztc= github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= +github.com/hashicorp/terraform-plugin-go v0.1.0/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= github.com/hashicorp/terraform-plugin-go v0.2.1 h1:EW/R8bB2Zbkjmugzsy1d27yS8/0454b3MtYHkzOknqA= github.com/hashicorp/terraform-plugin-go v0.2.1/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= +github.com/hashicorp/terraform-plugin-go v0.3.0 h1:AJqYzP52JFYl9NABRI7smXI1pNjgR5Q/y2WyVJ/BOZA= +github.com/hashicorp/terraform-plugin-go v0.3.0/go.mod h1:dFHsQMaTLpON2gWhVWT96fvtlc/MF1vSy3OdMhWBzdM= +github.com/hashicorp/terraform-plugin-mux v0.1.1 h1:MmJ+S0oJIFB8kGza9l+sfP9IlxNemWTGDI2/2+Rp34Y= +github.com/hashicorp/terraform-plugin-mux v0.1.1/go.mod h1:V3k40bdytku59n/iOwtrzILYSdNq6v8q8/IbUJvK6g0= +github.com/hashicorp/terraform-plugin-mux v0.2.0 h1:d+IQlxGpztO23nrf5X3ZL8bn1JeTxwz5lPuzezEUq7w= +github.com/hashicorp/terraform-plugin-mux v0.2.0/go.mod h1:ZLiSpKrAtyqS7d3QydVIz13c/j4ic0RMrhQ5Hu+S8zM= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0 h1:2c+vG46celrDCsfYEIzaXxvBaAXCqlVG77LwtFz8cfs= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0/go.mod h1:JBItawj+j8Ssla5Ib6BC/W9VQkOucBfnX7VRtyx1vw8= github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 h1:DGnxpIYRHXQZb2TOlQ1OCEYxoRQrAcbLIcYm8kvbFuU= github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3/go.mod h1:5wrrTcxbSaQXamCDbHZTHk6yTF9OEZaOvQ9fvLXBE3o= github.com/hashicorp/vault v0.10.4 h1:4x0lHxui/ZRp/B3E0Auv1QNBJpzETqHR2kQD3mHSBJU= diff --git a/main.go b/main.go index 400dc235..1755c7e0 100644 --- a/main.go +++ b/main.go @@ -1,16 +1,25 @@ package main import ( - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" + "context" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + tf5server "github.com/hashicorp/terraform-plugin-go/tfprotov5/server" + tfmux "github.com/hashicorp/terraform-plugin-mux" "github.com/hashicorp/terraform-provider-nomad/nomad" ) func main() { - plugin.Serve(&plugin.ServeOpts{ - ProviderFunc: func() *schema.Provider { - return nomad.Provider() - }, + ctx := context.Background() + muxed, err := tfmux.NewSchemaServerFactory(ctx, nomad.Provider().GRPCProvider) + if err != nil { + panic(err) + } + + err = tf5server.Serve("registry.terraform.io/hashicorp/nomad", func() tfprotov5.ProviderServer { + return muxed.Server() }) + if err != nil { + panic(err) + } } From 704539db6522c01e2f474fba4973b9b6a10299f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lapeyre?= Date: Wed, 16 Jun 2021 13:11:52 +0200 Subject: [PATCH 3/4] Add resource nomad_job_v2 using tfprotov5 --- go.mod | 6 +- go.sum | 364 ++++++ internal/protocolprovider/converter.go | 1136 ++++++++++++++++++ internal/protocolprovider/converter_test.go | 349 ++++++ internal/protocolprovider/data_router.go | 31 + internal/protocolprovider/job.go | 426 +++++++ internal/protocolprovider/job_test.go | 386 ++++++ internal/protocolprovider/resource_router.go | 63 + internal/protocolprovider/server.go | 97 ++ internal/protocolprovider/util.go | 83 ++ main.go | 5 +- nomad/data_source_acl_policies.go | 2 +- nomad/data_source_acl_policies_test.go | 4 +- nomad/data_source_acl_policy.go | 2 +- nomad/data_source_acl_policy_test.go | 2 +- nomad/data_source_acl_token.go | 2 +- nomad/data_source_acl_tokens.go | 2 +- nomad/data_source_datacenters.go | 2 +- nomad/data_source_deployments.go | 2 +- nomad/data_source_job_parser.go | 2 +- nomad/data_source_namespace.go | 2 +- nomad/data_source_namespaces.go | 2 +- nomad/data_source_plugins.go | 2 +- nomad/data_source_regions.go | 2 +- nomad/data_source_scaling_policies.go | 2 +- nomad/data_source_scaling_policy.go | 2 +- nomad/data_source_scheduler_config.go | 2 +- nomad/data_source_volumes.go | 2 +- nomad/datasource_nomad_job.go | 2 +- nomad/datasource_nomad_job_test.go | 2 +- nomad/datasource_nomad_plugin.go | 2 +- nomad/provider.go | 4 +- nomad/provider_test.go | 8 +- nomad/resource_acl_policy.go | 10 +- nomad/resource_acl_policy_test.go | 10 +- nomad/resource_acl_token.go | 10 +- nomad/resource_acl_token_test.go | 6 +- nomad/resource_external_volume.go | 4 +- nomad/resource_job.go | 8 +- nomad/resource_job_test.go | 46 +- nomad/resource_namespace.go | 8 +- nomad/resource_namespace_test.go | 12 +- nomad/resource_quota_specification.go | 8 +- nomad/resource_quota_specification_test.go | 10 +- nomad/resource_scheduler_config.go | 4 +- nomad/resource_sentinel_policy.go | 8 +- nomad/resource_sentinel_policy_test.go | 8 +- nomad/resource_volume.go | 6 +- 48 files changed, 3048 insertions(+), 110 deletions(-) create mode 100644 internal/protocolprovider/converter.go create mode 100644 internal/protocolprovider/converter_test.go create mode 100644 internal/protocolprovider/data_router.go create mode 100644 internal/protocolprovider/job.go create mode 100644 internal/protocolprovider/job_test.go create mode 100644 internal/protocolprovider/resource_router.go create mode 100644 internal/protocolprovider/server.go create mode 100644 internal/protocolprovider/util.go diff --git a/go.mod b/go.mod index ddd26637..a3adc1a1 100644 --- a/go.mod +++ b/go.mod @@ -19,9 +19,9 @@ require ( github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/nomad v1.1.0 github.com/hashicorp/nomad/api v0.0.0-20210517202321-f99f1e27bb66 - github.com/hashicorp/terraform-plugin-go v0.2.1 - github.com/hashicorp/terraform-plugin-mux v0.1.1 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 + github.com/hashicorp/terraform-plugin-go v0.3.0 + github.com/hashicorp/terraform-plugin-mux v0.2.0 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1 github.com/hashicorp/vault v0.10.4 github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 87da62bf..a7fc682f 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898 h1:SC+c6A1qTFstO9qmB86mPV2IpYme/2ZoEQ0hrP+wo+Q= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -19,12 +20,15 @@ cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNF cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= @@ -32,65 +36,106 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v44.0.0+incompatible h1:e82Yv2HNpS0kuyeCrV29OPKvEiqfs2/uJHic3/3iKdg= github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v10.7.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v10.15.3+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest v0.11.0/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest v0.11.4 h1:iWJqGEvip7mjibEqC/srXNdo+4wLEPiwlP/7dZLtoPc= github.com/Azure/go-autorest/autorest v0.11.4/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.2 h1:Aze/GQeAN1RRbGmnUJvUj+tFGBzFdIg3293/A9rbxC4= github.com/Azure/go-autorest/autorest/adal v0.9.2/go.mod h1:/3SMAM86bP6wC9Ev35peQDUeqFZBMH07vvUOmg4z/fE= github.com/Azure/go-autorest/autorest/azure/auth v0.5.0/go.mod h1:QRTvSZQpxqm8mSErhnbI+tANIBAKP7B+UIE2z4ypUO0= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.1 h1:bvUhZciHydpBxBmCheUgxxbSwJy7xcfjkUsjUcqSojc= github.com/Azure/go-autorest/autorest/azure/auth v0.5.1/go.mod h1:ea90/jvmnAwDrSooLH4sRIehEPtG/EPUXavDh31MnA4= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.0 h1:Ml+UCrnlKD+cJmSzrZ/RDcDw86NjkRUpnFh7V5JUhzU= github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod h1:JljT387FplPzBA31vUcvsetLKF3pec5bdAxjVU4kI2s= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= +github.com/Azure/go-autorest/autorest/validation v0.3.0 h1:3I9AAI63HfcLtphd9g39ruUwRI+Ca+z/f36KHPFRUss= github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5 h1:U7q69tqXiCf6m097GRlNQB0/6SI1qWIOHYHhCEvDxF4= github.com/LK4D4/joincontext v0.0.0-20171026170139-1724345da6d5/go.mod h1:nxQPcNPR/34g+HcK2hEsF99O+GJgIkW/OmPl8wtzhmk= +github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= +github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Microsoft/go-winio v0.4.3/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= +github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk= +github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= +github.com/Microsoft/hcsshim v0.8.8-0.20200312192636-fd0797d766b1 h1:2T9t72RkTRjAcuFc+4vaGWnRx/anVngE1/VGN/HFEVk= github.com/Microsoft/hcsshim v0.8.8-0.20200312192636-fd0797d766b1/go.mod h1:LVvUcNYEzt59fFVTuiPEgM6dgF70yMGdy/Qc/UmCbuU= +github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20180829222009-86f2a9fac6c5 h1:WLyvLAM0QfjAarRzRTG9EgT5McqGWNZMvqqSUSoyUUY= github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20180829222009-86f2a9fac6c5/go.mod h1:nMOvShGpWaf0bXwXmeu4k+O4uziuaEI8pWzIj3BUrOA= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/NYTimes/gziphandler v1.0.1 h1:iLrQrdwjDd52kHDA5op2UBJFjmOb9g+7scBan4RN8F0= github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PuerkitoBio/purell v1.0.0 h1:0GoNN3taZV6QI81IXgCbxMyEaJDXMSIjArYBCYzVVvs= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 h1:JCHLVE3B+kJde7bIEo5N4J+ZbLhp0J1Fs+ulyRws4gE= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af h1:DBNMBMuMiWYu0b+8KMJuWmfCkcxl09JwdlqwDZZ6U14= github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod h1:5Jv4cbFiHJMsVxt52+i0Ha45fjshj6wxYr1r19tB9bw= github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE= github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= +github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f h1:NNJE6p4LchkmNfNskDUaSbrwxZzr7t2/lj2aS+q4oF0= github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U= github.com/apparentlymart/go-cidr v1.0.1/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= @@ -99,9 +144,11 @@ github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 h1:MzVXffFU github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= +github.com/apparentlymart/go-textseg/v12 v12.0.0 h1:bNEQyAGak9tojivJNkoqWErVCQbjdL7GzRt3F8NvfJ0= github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec= github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg= @@ -110,6 +157,7 @@ github.com/armon/go-metrics v0.3.4/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= @@ -120,152 +168,246 @@ github.com/aws/aws-sdk-go v1.38.20/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/blang/semver v3.1.0+incompatible h1:7hqmJYuaEK3qwVjWubYiht3j93YI0WQBuysxHIfUriU= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmatcuk/doublestar v1.1.5 h1:2bNwBOmhyFEFcoB3tGvTD5xanq+4kyOZlB8wFYbMjkk= github.com/bmatcuk/doublestar v1.1.5/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/checkpoint-restore/go-criu/v4 v4.1.0 h1:WW2B2uxx9KWF6bGlHqhm8Okiafwwx7Y2kcpn8lCpjgo= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= +github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cilium/ebpf v0.2.0 h1:Fv93L3KKckEcEHR3oApXVzyBTDA8WAm6VXhPE00N3f8= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533 h1:8wZizuKuZVu5COB7EsBYxBQz8nRcXXn5d4Gt91eJLvU= github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/container-storage-interface/spec v1.4.0 h1:ozAshSKxpJnYUfmkpZCTYyF/4MYeYlhdXbAvPvfGmkg= github.com/container-storage-interface/spec v1.4.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= +github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/console v1.0.1 h1:u7SFAJyRqWcG6ogaMAx3KjSTy1e3hT9QxqX7Jco7dRc= github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.2 h1:ForxmXkA6tPIvffbrDAcPUIB32QgXkt2XFj+F0UxetA= github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c h1:8ahmSVELW1wghbjerVAyuEYD5+Dio66RYvSS0iGfL1M= github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= +github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 h1:PUD50EuOMkXVcpBIA/R95d56duJR9VxhwncsFbNnxW4= github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= +github.com/containerd/go-cni v0.0.0-20190904155053-d20b7eebc7ee h1:fV37ZKnYs79fSyI3mu/XZFJVezrVsXBLbfojcTPpdXM= github.com/containerd/go-cni v0.0.0-20190904155053-d20b7eebc7ee/go.mod h1:2wlRxCQdiBY+OcjNg5x8kI+5mEL1fGt25L4IzQHYJsM= +github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 h1:esQOJREg8nw8aXj6uCN5dfW5cKUBiEJ/+nni1Q/D/sw= github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= +github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de h1:dlfGmNcE3jDAecLqwKPMNX6nk2qh1c1Vg1/YTzpOOF4= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= +github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/containernetworking/cni v0.7.2-0.20190612152420-dc953e2fd91f h1:zLuuwrIjPmE9XxixRYl8KBiGUNaN5DpxLZJ39f3BFio= github.com/containernetworking/cni v0.7.2-0.20190612152420-dc953e2fd91f/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/containernetworking/plugins v0.7.3-0.20190501191748-2d6d46d308b2 h1:WT1OeJOkmYxVP5/e3P+/MVJ1ftii14o80u0N9aK2tCg= github.com/containernetworking/plugins v0.7.3-0.20190501191748-2d6d46d308b2/go.mod h1:dagHaAhNjXjT9QYOklkKJDGaQPTg4pf//FrUcJeb7FU= +github.com/coredns/coredns v1.1.2 h1:bAFHrSsBeTeRG5W3Nf2su3lUGw7Npw2UKeCJm/3A638= github.com/coredns/coredns v1.1.2/go.mod h1:zASH/MVDgR6XZTbxvOnsZfffS+31vg6Ackf/wo1+AM0= +github.com/coreos/go-iptables v0.4.3-0.20190724151750-969b135e941d h1:9n0vuQxZw5yuleXDNqGLSw3o5s6vZJJH36ZSU7626zw= github.com/coreos/go-iptables v0.4.3-0.20190724151750-969b135e941d/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1 h1:dCqRswe3ZAwkQWdvFLwRqmJCpGP3DWb7bFogdqY3+QU= github.com/cyphar/filepath-securejoin v0.2.3-0.20190205144030-7efe413b52e1/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= +github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba h1:p6poVbjHDkKa+wtC8frBMwQtT3BmqGYBjzMwJ63tuR4= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/digitalocean/godo v1.1.1/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nbpNqkUIozU= github.com/digitalocean/godo v1.7.5/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nbpNqkUIozU= +github.com/digitalocean/godo v1.10.0 h1:uW1/FcvZE/hoixnJcnlmIUvTVNdZCLjRLzmDtRi1xXY= github.com/digitalocean/godo v1.10.0/go.mod h1:h6faOIcZ8lWIwNQ+DN7b3CgX4Kwby5T+nbpNqkUIozU= +github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v0.0.0-20200303215952-eb310fca4956 h1:5/ZRsUbguX7xFNLlbxVQY/yhD3Psy+vylKZrNme5BJs= github.com/docker/cli v0.0.0-20200303215952-eb310fca4956/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20191101170500-ac7306503d23/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v17.12.0-ce-rc1.0.20200330121334-7f8b4b621b5d+incompatible h1:x+LFTD06kE2vF3WSFCG3D4XdqE2FD61524u/cXQLgws= github.com/docker/docker v17.12.0-ce-rc1.0.20200330121334-7f8b4b621b5d+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.6.2-0.20180719074751-73e5f5dbfea3 h1:LDAx5G+S5Ae1EWeSEXG9kQ3S/EUsWBgZhfS7JWASa3o= github.com/docker/docker-credential-helpers v0.6.2-0.20180719074751-73e5f5dbfea3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 h1:yWHOI+vFjEsAakUTSrtqc/SAHrhSkmn48pqjidZX3QA= github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libnetwork v0.8.0-dev.2.0.20200612180813-9e99af28df21 h1:RvyaXv8RgMpJIT73oQFOj4Vos1c1rwJcIm3sPHdd1Js= github.com/docker/libnetwork v0.8.0-dev.2.0.20200612180813-9e99af28df21/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f h1:AwZUiMWfYSmIiHdFJIubTSs8BFIFoMmUFbeuwBzHIPs= github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.5 h1:lRJIqDD8yjV1YyPRqecMdytjDLs2fTXq363aCib5xPU= github.com/envoyproxy/go-control-plane v0.9.5/go.mod h1:OXl5to++W0ctG+EHWTFUjiypVxC/Y4VLc/KFU+al13s= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/frankban/quicktest v1.4.0 h1:rCSCih1FnSWJEel/eub9wclBSqpF2F/PuvxUWGWnbO8= github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsouza/go-dockerclient v1.6.5 h1:vuFDnPcds3LvTWGYb9h0Rty14FLgkjHZdwLDROCdgsw= github.com/fsouza/go-dockerclient v1.6.5/go.mod h1:GOdftxWLWIbIWKbIMDroKFJzPdg6Iw7r+jX1DDZdVsA= +github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-billy/v5 v5.1.0 h1:4pl5BV4o7ZG/lterP4S6WzJ6xr49Ba5ET9ygheTYahk= +github.com/go-git/go-billy/v5 v5.1.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEssk= github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM= +github.com/go-git/go-git/v5 v5.3.0 h1:8WKMtJR2j8RntEXR/uvTKagfEt4GYlwQ7mntE4+0GWc= +github.com/go-git/go-git/v5 v5.3.0/go.mod h1:xdX4bWJ48aOrdhnl2XqHYstHbbp6+LFS4r4X+lNVprw= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ini/ini v1.25.4 h1:Mujh4R/dH6YL8bxuISne3xX2+qcQ9p0IxKAP6ExWoUo= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvIJ/QDllP44g= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1 h1:wSt/4CYxs70xbATrGXhokKF1i0tZjENLOo1ioIO13zk= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9 h1:tF+augKRWlWx0J0B7ZyyKSiTyV6E1zZe+7b3qQlcEf8= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501 h1:C1JKChikHGpXwT5UQDFaryIpDtyyGL/CR6C2kB7F1oc= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87 h1:zP3nY8Tk2E6RTkqGYrarZXuzh+ffyLDljLxCy1iJw80= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4= github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/googleapis v1.2.0 h1:Z0v3OJDotX9ZBpdz2V+AI7F4fITSZhVE5mg6GQppwMM= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -277,6 +419,7 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -295,8 +438,10 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -307,9 +452,11 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0= github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -321,35 +468,48 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99 h1:Ak8CrdlwwXwAZxzS66vgPt4U8yUZX7JwLvVR58FN5jM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33 h1:893HsJqtxp9z1SF76gg6hY70hRY1wVlTSnC/h1yUDCo= github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc= github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.1-0.20200228141219-3ce3d519df39 h1:MqvH60+R2JhSdvVgGxmExOndrkRQtGW7w4+gcrymN64= github.com/grpc-ecosystem/go-grpc-middleware v1.2.1-0.20200228141219-3ce3d519df39/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= github.com/hashicorp/consul v1.7.8 h1:hp308KxAf3zWoGuwp2e+0UUhrm6qHjeBQk3jCZ+bjcY= github.com/hashicorp/consul v1.7.8/go.mod h1:urbfGaVZDmnXC6geg0LYPh/SRUk1E8nfmDHpz+Q0nLw= +github.com/hashicorp/consul-template v0.25.1 h1:+D2s8eyRqWyX7GPNxeUi8tsyh8pRn3J6k8giEchPfKQ= github.com/hashicorp/consul-template v0.25.1/go.mod h1:/vUsrJvDuuQHcxEw0zik+YXTS7ZKWZjQeaQhshBmfH0= github.com/hashicorp/consul/api v1.4.0/go.mod h1:xc8u05kyMa3Wjr9eEAsIAo3dg8+LywT5E/Cl7cNS5nU= github.com/hashicorp/consul/api v1.8.1 h1:BOEQaMWoGMhmQ29fC26bi0qb7/rId9JzZP2V0Xmx7m8= github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= github.com/hashicorp/consul/sdk v0.4.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= +github.com/hashicorp/consul/sdk v0.7.0 h1:H6R9d008jDcHPQPAqPNuydAshJ4v5/8URdFnUvK/+sc= github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= github.com/hashicorp/cronexpr v1.1.0/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= @@ -358,6 +518,7 @@ github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FK github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-bexpr v0.1.2 h1:ijMXI4qERbzxbCnkxmfUtwMyjrrk3y+Vt0MxojNCbBs= github.com/hashicorp/go-bexpr v0.1.2/go.mod h1:ANbpTX1oAql27TZkKVeW8p1w8NTdnyzPe/0qqPCKohU= github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod h1:xIwEieBHERyEvaeKF/TcHh1Hu+lxPM+n2vT1+g9I4m4= github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= @@ -365,20 +526,28 @@ github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuD github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-connlimit v0.2.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0= +github.com/hashicorp/go-connlimit v0.3.0 h1:oAojHGjFxUTTTA8c5XXnDqWJ2HLuWbDiBPTpWvNzvqM= github.com/hashicorp/go-connlimit v0.3.0/go.mod h1:OUj9FGL1tPIhl/2RCfzYHrIiWj+VVPGNyVPnUX8AqS0= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320/go.mod h1:EiZBMaudVLy8fmjf9Npq1dq9RalhveqZG5w/yz3mHWs= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 h1:kgvybwEeu0SXktbB2y3uLHX9lklLo+nzUwh59A3jzQc= github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840/go.mod h1:Abjk0jbRkDaNCzsRhOv2iDCofYpX1eVsjozoiK63qLA= github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod h1:NnH5X4UCBEBdTuK2L8s4e4ilJm3UmGX0bANHCz0HSs0= +github.com/hashicorp/go-discover v0.0.0-20200812215701-c4b85f6ed31f h1:7WFMVeuJQp6BkzuTv9O52pzwtEFVUJubKYN+zez8eTI= github.com/hashicorp/go-discover v0.0.0-20200812215701-c4b85f6ed31f/go.mod h1:D4eo8/CN92vm9/9UDG+ldX1/fMFa4kpl8qzyTolus8o= +github.com/hashicorp/go-envparse v0.0.0-20180119215841-310ca1881b22 h1:HTmDIaSN95gbdMyrsbNiXSdW4fbGctGQwEqv0H7OhDQ= github.com/hashicorp/go-envparse v0.0.0-20180119215841-310ca1881b22/go.mod h1:/NlxCzN2D4C4L2uDE6ux/h6jM+n98VFQM14nnCIfHJU= +github.com/hashicorp/go-gatedio v0.5.0 h1:Jm1X5yP4yCqqWj5L1TgW7iZwCVPGtVc+mro5r/XX7Tg= github.com/hashicorp/go-gatedio v0.5.0/go.mod h1:Lr3t8L6IyxD3DAeaUxGcgl2JnRUpWMCsmBl4Omu/2t4= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-getter v1.5.0/go.mod h1:a7z7NPPfNQpJWcn4rSWFtdrSldqLdLPEF3d8nFMsSLM= github.com/hashicorp/go-getter v1.5.2 h1:XDo8LiAcDisiqZdv0TKgz+HtX3WN7zA2JD1R1tjsabE= github.com/hashicorp/go-getter v1.5.2/go.mod h1:orNH3BTYLu/fIxGIdLjLoAJHWMDQ/UKQr5O4m3iBuoo= +github.com/hashicorp/go-getter v1.5.3 h1:NF5+zOlQegim+w/EUhSLh6QhXHmZMEeHLQzllkQ3ROU= +github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -392,9 +561,11 @@ github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-memdb v1.0.3/go.mod h1:LWQ8R70vPrS4OEY9k28D2z8/Zzyu34NVzeRibGAzHO0= +github.com/hashicorp/go-memdb v1.3.0 h1:xdXq34gBOMEloa9rlGStLxmfX/dyIK8htOv36dQUwHU= github.com/hashicorp/go-memdb v1.3.0/go.mod h1:Mluclgwib3R93Hk5fxEfiRhB+6Dar64wWh71LpNSe3g= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= @@ -405,8 +576,10 @@ github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= github.com/hashicorp/go-plugin v1.4.0 h1:b0O7rs5uiJ99Iu9HugEzsM67afboErkHUWddUSpUO3A= github.com/hashicorp/go-plugin v1.4.0/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= +github.com/hashicorp/go-raftchunking v0.6.1 h1:moEnaG3gcwsWNyIBJoD5PCByE+Ewkqxh6N05CT+MbwA= github.com/hashicorp/go-raftchunking v0.6.1/go.mod h1:cGlg3JtDy7qy6c/3Bu660Mic1JF+7lWqIwCFSb08fX0= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.5.4 h1:1BZvpawXoJCWX6pNtow9+rpEj+3itIlutiqnntI6jOE= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= @@ -414,7 +587,9 @@ github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR3 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= @@ -424,6 +599,7 @@ github.com/hashicorp/go-version v1.2.1-0.20191009193637-2046c9d0f0b0/go.mod h1:f github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -436,14 +612,18 @@ github.com/hashicorp/hcl v1.0.1-0.20201016140508-a07e7d50bbee/go.mod h1:gwlu9+/P github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc h1:x0m+f0NSbNCz1z+mkBiD3MIThn3OJ8elHtF7pCMvyJ8= github.com/hashicorp/hcl/v2 v2.9.2-0.20210407182552-eb14f8319bdc/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= +github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5 h1:uk280DXEbQiCOZgCOI3elFSeNxf8YIZiNsbr2pQLYD0= github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod h1:KHvg/R2/dPtaePb16oW4qIyzkMxXOL38xjRN64adsts= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/mdns v1.0.1 h1:XFSOubp8KWB+Jd2PDyaX5xUd5bhSP/+pTDZVDMzZJM8= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.2.2 h1:5+RffWKwqJ71YPu9mWsF7ZOscZmwfasdA8kbdC7AO2g= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 h1:lc3c72qGlIMDqQpQH82Y4vaglRMMFdJbziYWriR4UcE= github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod h1:/z+jUGRBlwVpUZfjute9jWaF6/HuhjuFQuL1YXzVD1Q= github.com/hashicorp/nomad v1.1.0 h1:YLIQB+qdbd/SoQaVODxzy6lS41kx38Du7fzC0DeCJww= github.com/hashicorp/nomad v1.1.0/go.mod h1:dcHq/itapIpWeeN79e7viSl35azWnhZfekueJcCzPxw= @@ -452,7 +632,9 @@ github.com/hashicorp/nomad/api v0.0.0-20210517202321-f99f1e27bb66 h1:PPOK5yj35Cw github.com/hashicorp/nomad/api v0.0.0-20210517202321-f99f1e27bb66/go.mod h1:vYHP9jMXk4/T2qNUbWlQ1OHCA1hHLil3nvqSmz8mtgc= github.com/hashicorp/raft v1.1.1/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= github.com/hashicorp/raft v1.1.2/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= +github.com/hashicorp/raft v1.1.3-0.20200211192230-365023de17e6 h1:+H0NF++gFCFqQQdjRstZssPZcx9BiaMOGHxSxoNvBN8= github.com/hashicorp/raft v1.1.3-0.20200211192230-365023de17e6/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= +github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea h1:xykPFhrBAS2J0VBzVa5e80b5ZtYuNQtgXjN40qBZlD4= github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.8.3/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc1oal+k= @@ -463,8 +645,12 @@ github.com/hashicorp/terraform-exec v0.12.0 h1:Tb1VC2gqArl9EJziJjoazep2MyxMk00tn github.com/hashicorp/terraform-exec v0.12.0/go.mod h1:SGhto91bVRlgXQWcJ5znSz+29UZIa8kpBbkGwQ+g9E8= github.com/hashicorp/terraform-exec v0.13.0 h1:1Pth+pdWJAufJuWWjaVOVNEkoRTOjGn3hQpAqj4aPdg= github.com/hashicorp/terraform-exec v0.13.0/go.mod h1:SGhto91bVRlgXQWcJ5znSz+29UZIa8kpBbkGwQ+g9E8= +github.com/hashicorp/terraform-exec v0.13.3 h1:R6L2mNpDGSEqtLrSONN8Xth0xYwNrnEVzDz6LF/oJPk= +github.com/hashicorp/terraform-exec v0.13.3/go.mod h1:SSg6lbUsVB3DmFyCPjBPklqf6EYGX0TlQ6QTxOlikDU= github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8ebSW0vztc= github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= +github.com/hashicorp/terraform-json v0.10.0 h1:9syPD/Y5t+3uFjG8AiWVPu1bklJD8QB8iTCaJASc8oQ= +github.com/hashicorp/terraform-json v0.10.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE= github.com/hashicorp/terraform-plugin-go v0.1.0/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= github.com/hashicorp/terraform-plugin-go v0.2.1 h1:EW/R8bB2Zbkjmugzsy1d27yS8/0454b3MtYHkzOknqA= github.com/hashicorp/terraform-plugin-go v0.2.1/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4= @@ -478,30 +664,47 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0 h1:2c+vG46celrDCsfYEIzaXxvBa github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0/go.mod h1:JBItawj+j8Ssla5Ib6BC/W9VQkOucBfnX7VRtyx1vw8= github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 h1:DGnxpIYRHXQZb2TOlQ1OCEYxoRQrAcbLIcYm8kvbFuU= github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3/go.mod h1:5wrrTcxbSaQXamCDbHZTHk6yTF9OEZaOvQ9fvLXBE3o= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1 h1:OZ+Q7irJBDhb71XzMSPGJvTIW101sOmbDg5i5qV1odY= +github.com/hashicorp/terraform-plugin-sdk/v2 v2.6.1/go.mod h1:72j8cKfs9IirGhPMXJJWLTvRUK4zATtrCOvs2avDlo8= github.com/hashicorp/vault v0.10.4 h1:4x0lHxui/ZRp/B3E0Auv1QNBJpzETqHR2kQD3mHSBJU= github.com/hashicorp/vault v0.10.4/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bAbosPMpP0= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= +github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519 h1:2qdbEUXjHohC+OYHtVU5lujvPAHPKYR4IMs9rsiUTk8= github.com/hashicorp/vault/api v1.0.5-0.20190730042357-746c0b111519/go.mod h1:i9PKqwFko/s/aihU1uuHGh/FaQS+Xcgvd9dvnfAvQb0= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= +github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8 h1:fLUoZ8cI/pqlVCk09r88cVoY7ggKEl1A4e6Mujr3RvU= github.com/hashicorp/vault/sdk v0.1.14-0.20190730042320-0dc007d98cc8/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= +github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw= github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745 h1:8as8OQ+RF1QrsHvWWsKBtBKINhD9QaD1iozA1wrO4aA= github.com/hpcloud/tail v1.0.1-0.20170814160653-37f427138745/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= +github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 h1:rw3IAne6CDuVFlZbPOkA7bhxlqawFh7RJJ+CejfMaxE= github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg= +github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da h1:FjHUJJ7oBW4G/9j1KzlHaXL09LyMVM9rupS39lncbXk= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -512,31 +715,45 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= +github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869 h1:BvV6PYcRz0yGnWXNZrd5wginNT1GfFfPvvWpPbjfFL8= github.com/joyent/triton-go v0.0.0-20190112182421-51ffac552869/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= +github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba h1:NARVGAAgEXvoMeNPHhPFt1SBt1VMznA3Gnz9d0qj+co= github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ= github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -547,12 +764,17 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+ github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod h1:QdfYv6y6qPA9pbBA2qXtoT8BMKha6UyNbxWGWl/9Jfk= github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod h1:KKqSnk/VVSW8kEyO2vVCXoanzEutKdlBAPohmGXkxCk= github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod h1:3kvONayqCaj+UgrRZGpgfXzHdMYCAO0KAt4/8n0L57Y= +github.com/likexian/gokit v0.20.16 h1:8ypmVXLx8yIvlTwzH8Ybz8LDAfWjdy0W5O354JWPjA4= github.com/likexian/gokit v0.20.16/go.mod h1:kn+nTv3tqh6yhor9BC4Lfiu58SmH8NmQ2PmEl+uM6nU= github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod h1:Typ1BfnATYtZ/+/shXfFYLrovhFyuKvzwrdOnIDHlmg= github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod h1:U4O1vIJvIKwbMZKUJ62lppfdvkCdVd2nfMimHK81eec= +github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b h1:tNa5q0zLsg6EzUI4npXeUYwk/xuTtMcKdVnRsYdOHzk= github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod h1:3BWwtmKP9cXWwYCr5bkoVDEfLywacOv0s06OBEDpyt8= +github.com/linode/linodego v0.7.1 h1:4WZmMpSA2NRwlPZcc0+4Gyn7rr99Evk9bnr0B3gXRKE= github.com/linode/linodego v0.7.1/go.mod h1:ga11n3ivecUrPCHN0rANxKmfWBJVkOXfLMZinAbj2sY= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a h1:TpvdAwDAt1K4ANVOfcihouRdvP+MgAfDWwBuct4l6ZY= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/marstr/guid v1.1.0 h1:/M4H/1G4avsieL6BbUwCOBzulmoeKVP5ux/3mQNnbyI= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -565,22 +787,30 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc= github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26 h1:gPxPSwALAeHJSjarOs00QjVdV9QoBvc1D2ujQUr5BzU= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/cli v1.1.1 h1:J64v/xD7Clql+JVKSvkYojLOXu1ibnY9ZjGLwSt/89w= github.com/mitchellh/cli v1.1.1/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/cli v1.1.2 h1:PvH+lL2B7IQ101xQL63Of8yFS2y+aDlsFcsqNc+u/Kw= +github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4= +github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286 h1:KHyL+3mQOF9sPfs26lsefckcFNDcIZtiACQiECzIUkw= github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b h1:9+ke9YJ9KGWw5ANXK6ozjoK47uI3uNbXv4YVINBnGm8= github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -590,9 +820,12 @@ github.com/mitchellh/go-testing-interface v1.0.4/go.mod h1:kRemZodwjscx+RGhAo8eI github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= +github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9dGS02Q3Y= github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= +github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= @@ -600,21 +833,32 @@ github.com/mitchellh/mapstructure v1.2.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/51gbeLHfKGNfgEQQIWrlbdaOsidbQ= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/sys/mountinfo v0.4.0 h1:1KInV3Huv18akCu58V7lzNlt+jFmqlu1EaErnEHE/VM= github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d h1:7PxY7LVfSZm7PEeBTyK1rj1gABdCO2mbri6GKO1cMDs= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 h1:F9x/1yl3T2AeKLr2AMdilSD8+f9bvMnNN8VS5iDtovc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/ncw/swift v1.0.47 h1:4DQRPj35Y41WogBxyhOXlrI37nzGlyEcsforeudyYPQ= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW7hr4IVovMwWg0E0PYcyW8CzqDcVmaew9cujU4s= github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -626,33 +870,47 @@ github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28/go.mod h1:dlhp/R75TPv9 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc93 h1:x2UMpOOVf3kQ8arv/EsDGwim8PTNqzL1/EYDr/+scOM= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d h1:pNa8metDkwZjb9g4T8s+krQ+HRgZAkqnXml+wNir/+s= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39 h1:H7DMc6FAjgwZZi8BRqjrAAHWoqEr5e5L6pS4V0ezet4= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= +github.com/opencontainers/selinux v1.8.0 h1:+77ba4ar4jsCbL1GLbFL8fFM57w6suPfSS9PDLDY7KM= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= +github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c h1:vwpFWvAO8DeIZfFeqASzZfsxuWPno9ncAebBEP0N3uE= github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod h1:otzZQXgoO96RTzDB/Hycg0qZcXZsWJGJRSXbmEIJ+4M= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.2.5+incompatible h1:xOYu2+sKj87pJz7V+I7260354UlcRyAZUGhMCToTzVw= github.com/pierrec/lz4 v2.2.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -663,64 +921,93 @@ github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0 h1:YVIb/fVcOTMSqtqZWSKnHpSLBxu8DKgxq8z6RuBZwqI= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rboyer/safeio v0.2.1 h1:05xhhdRNAdS3apYm7JRjOqngf4xruaW959jmRxGDuSU= github.com/rboyer/safeio v0.2.1/go.mod h1:Cq/cEPK+YXFn622lsQ0K4KsPZSPtaptHHEldsy7Fmig= +github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o= github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU= +github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.1-0.20170703205827-abc90934186a+incompatible h1:ZVvb3R06BXNcQ3nXT2eANJAwGeRu4tbUzLI7sIyFZ2s= github.com/ryanuber/columnize v2.1.1-0.20170703205827-abc90934186a+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128 h1:vWI7jlfJVWN//T8jrt5JduYkSid+Sl/fRz33J1jQ83k= github.com/seccomp/libseccomp-golang v0.9.2-0.20200314001724-bdab42bd5128/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880 h1:1Ge4j/3uB2rxzPWD3TC+daeCw+w91z8UCUL/7WH5gn8= github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil/v3 v3.21.2 h1:fIOk3hyqV1oGKogfGNjUZa0lUbtlkx3+ZT0IoJth2uM= github.com/shirou/gopsutil/v3 v3.21.2/go.mod h1:ghfMypLDrFSWN2c9cDYFLHyynQ+QUht0cv/18ZqVczw= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d h1:bVQRCxQvfjNUeRqaY/uT0tFuvuFY0ulgnczuR684Xic= github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod h1:Cw4GTlQccdRGSEf6KiMju767x0NEHE0YIVPJSaXjlsw= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -730,38 +1017,60 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible h1:8uRvJleFpqLsO77WaAh2UrasMOzd8MxXrNj20e7El+Q= github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= +github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9 h1:/Bsw4C+DEdqPjt8vAqaC9LAqpAQnaCQQqmolqq3S1T4= github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod h1:RHkNRtSLfOK7qBTHaeSX1D6BNpI3qw7NTxsmNr4RvN8= github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek= +github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.1/go.mod h1:9aU+wOc6WjUIZEwWMP62PL/41d65P+iks1gBkr4QyP8= +github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= +github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= +github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo= github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= +github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f h1:mvXjJIHRZyhNuGassLTcXTwjiWq7NmjdavZsUnmFybQ= github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32 h1:5tjfNdR2ki3yYQ842+eX2sQHeiwpKJ0RnHO4IYOc4V8= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= @@ -769,9 +1078,13 @@ github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q github.com/zclconf/go-cty v1.4.0/go.mod h1:nHzOclRkoj++EU9ZjSrZvRG0BXIWt8c7loYc0qXAFGQ= github.com/zclconf/go-cty v1.8.0 h1:s4AvqaeQzJIu3ndv4gVIhplVD0krU+bgrcLSVUnaWuA= github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.8.2 h1:u+xZfBKgpycDnTNjPhGiTEYZS5qS/Sb5MqSfm7vzcjg= +github.com/zclconf/go-cty v1.8.2/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= github.com/zclconf/go-cty-yaml v1.0.2 h1:dNyg4QLTrv2IfJpm7Wtxi55ed5gLGOlPrZ6kMd51hY0= github.com/zclconf/go-cty-yaml v1.0.2/go.mod h1:IP3Ylp0wQpYm50IHK8OZWKMu6sPJIUgKa8XhiVHura0= +go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -780,8 +1093,11 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -801,6 +1117,9 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -810,8 +1129,10 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -825,6 +1146,7 @@ golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= @@ -873,6 +1195,9 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs= +golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -887,6 +1212,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -947,6 +1273,10 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHjJYiktO7QnJC5ut7iY4= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -960,6 +1290,7 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1037,6 +1368,7 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 h1:Cpp2P6TPjujNoC5M2KHY6g7wfyLYfIWRZaSdIKfDasA= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1098,8 +1430,11 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1107,15 +1442,26 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo= gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.4.1 h1:H0TmLt7/KmzlrDOpa1F+zr0Tk90PbJYBfsVUmRLrf9Y= gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/tomb.v2 v2.0.0-20140626144623-14b3d72120e8 h1:EQ3aCG3c3nkUNxx6quE0Ux47RYExj7cJyRMxUXqPf6I= gopkg.in/tomb.v2 v2.0.0-20140626144623-14b3d72120e8/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -1128,7 +1474,9 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1136,28 +1484,44 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= +k8s.io/client-go v8.0.0+incompatible h1:tTI4hRmb1DRMl4fG6Vclfdi6nTM82oIrTT7HfitmxC4= k8s.io/client-go v8.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/cri-api v0.17.3 h1:jvjVvBqgZq3WcaPq07n0h5h9eCnIaR4dhKyHSoZG8Y8= k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= +k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/internal/protocolprovider/converter.go b/internal/protocolprovider/converter.go new file mode 100644 index 00000000..41408eae --- /dev/null +++ b/internal/protocolprovider/converter.go @@ -0,0 +1,1136 @@ +package protocol + +import ( + "encoding/json" + "fmt" + "math/big" + "reflect" + "sort" + "strings" + "time" + + "github.com/hashicorp/nomad/api" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +type Converter struct { + Schema *tfprotov5.SchemaBlock + AsGo func(tftypes.Value, interface{}) error + AsValue func(interface{}) tftypes.Value +} + +func NewConverter(val reflect.Type) (*Converter, error) { + // We look at the field tags to find how to convert the Go type to a + // similar Terraform schema, and build functions that will convert the + // tftype.Value to a Go struct and vice-versa. + + // First, let's find the type of the tags in this struct. HCLv2 accepts + // 'optional', 'block', 'label', 'attr', and 'remain' but Nomad only uses + // the first three so we will only support that. By focusing only on what + // Nomad needs we can go straight to the point, only do the bare minimum + // and handle edge cases explicitely when there is some (for example for + // the config and policy stanza) rather than making some general converter + // which would be a much more difficult endeavor. + + labels, err := getTaggedFields("label", val) + if err != nil { + return nil, err + } + + // It is possible for a block to have multiple labels in HCLv2 but there + // is none like that in Nomad for now so we return an error immediately + // if this hypothesis does not hold, this way the tests will fail as + // soon as we update the Nomad api client and we will be able to update + // this function based on the new behavior. + if len(labels) > 1 { + return nil, fmt.Errorf("multiple labels found") + } else if len(labels) == 1 { + + var field reflect.StructField + var name string + for n, f := range labels { + field = f + name = n + } + + if t := field.Type.String(); t != "string" && t != "*string" { + // The label of a block should always be a string + return nil, fmt.Errorf("wrong type %q for label %q", t, name) + } + } + + fields := Fields{} + + // Let's now add all attributes to the schema and create their converters + optionals, err := getTaggedFields("optional", val) + if err != nil { + return nil, err + } + + for name, field := range optionals { + // The interesting part for the attributes is handled by the converters. + // A very important thing of using terraform-plugin-go is that we can + // detect unset attributes (they would default to the default value in + // terraform-plugin-sdk) so that we can leave a nil pointer and the + // server will choose the default instead of us having to guess. This is + // great because the default may change between versions, it is + // error-prone to copy them from the docs or Nomad code source and they + // may depend on external factor that the provider may not know. + attr, err := NewAttribute(field.Type, field.Name, name) + if err != nil { + return nil, err + } + fields = append(fields, attr) + } + + // The last thing to do is to convert the blocks + blocks, err := getTaggedFields("block", val) + if err != nil { + return nil, err + } + + for name, field := range blocks { + + // If the block is a pointer to a struct we need to convert the actual + // struct + val := field.Type + if val.Kind() == reflect.Ptr { + val = val.Elem() + } + + if val.Kind() == reflect.Map { + // Maps are not blocks in Terraform and must be an attribute in + // protocol 5. Since terraform-plugin-mux does not support + // protocol 6 we use an attribute here, which means the + // Terraform configuration will have a = sign where the Nomad + // file does not need it, but this is a small disagreement + // that we should be able to fix later. + attr, err := NewAttribute(val, field.Name, name) + if err != nil { + return nil, err + } + fields = append(fields, attr) + + } else { + // Now that we handled the labels, the attributes and the map blocks + // that needed to be converted as attributes for the moment we can + // finally convert the remaining blocks. + // There is three types of block that we need to concern ourselves with: + // - a Single block, which is a block that can appear at most once in + // the configuration + // - a List block, which may appear multiple time + // - a Map block, which is a block with a label + // While we can see the difference between the first two just by looking + // at the current struct, finding out whether it should be a list or a + // map requires to look inside the child to see if it has a label. + block, err := NewBlock(val, field.Name, name) + if err != nil { + return nil, err + } + fields = append(fields, block) + } + } + + return &Converter{ + Schema: &tfprotov5.SchemaBlock{ + Version: 1, + Attributes: fields.GetAttributesSchema(), + BlockTypes: fields.GetBlocksSchema(), + }, + AsGo: func(val tftypes.Value, obj interface{}) error { + o := reflect.Indirect(reflect.ValueOf(obj)) + + for _, field := range fields { + f := o.FieldByName(field.GetGoName()) + if err := field.AsGo(val, f); err != nil { + return err + } + } + + return nil + }, + AsValue: func(obj interface{}) tftypes.Value { + val := map[string]tftypes.Value{} + attrs := map[string]tftypes.Type{} + optionalAttrs := map[string]struct{}{} + o := reflect.Indirect(reflect.ValueOf(obj)) + + for _, field := range fields { + + var e interface{} + if o.IsValid() { + f := o.FieldByName(field.GetGoName()) + e = f.Interface() + } + + v := field.AsValue(e) + val[field.GetValueName()] = v + attrs[field.GetValueName()] = v.Type() + } + + return tftypes.NewValue( + tftypes.Object{ + AttributeTypes: attrs, + OptionalAttributes: optionalAttrs, + }, + val, + ) + }, + }, nil +} + +func getTaggedFields(kind string, val reflect.Type) (map[string]reflect.StructField, error) { + fields := map[string]reflect.StructField{} + + for i := 0; i < val.NumField(); i++ { + field := val.Field(i) + tag, ok := field.Tag.Lookup("hcl") + + if !ok { + // If the field does not have an hcl tag we just skip it. + continue + } + + parts := strings.SplitN(tag, ",", 2) + if len(parts) != 2 { + return nil, fmt.Errorf("wrong number of parts for %q", tag) + } + + name := parts[0] + + if kind == parts[1] { + fields[name] = field + } + } + + return fields, nil +} + +func getLabelFieldName(val reflect.Type) (string, error) { + var field reflect.StructField + labels, err := getTaggedFields("label", val) + if err != nil { + return "", err + } + + // It is possible for a block to have multiple labels in HCLv2 but there + // is none like that in Nomad for now so we return an error immediately + // if this hypothesis does not hold, this way the tests will fail as + // soon as we update the Nomad api client and we will be able to update + // this function based on the new behavior. + if len(labels) > 1 { + return "", fmt.Errorf("multiple labels found") + } else if len(labels) == 0 { + return "", fmt.Errorf("no label found in %q", val.String()) + } else if len(labels) == 1 { + + for _, f := range labels { + field = f + } + + if t := field.Type.String(); t != "string" && t != "*string" { + // The label of a block should always be a string + return "", fmt.Errorf("wrong type %q for label %q", t, field.Name) + } + } + + return field.Name, nil +} + +type Field interface { + GetGoName() string + GetValueName() string + AsGo(tftypes.Value, reflect.Value) error + AsValue(interface{}) tftypes.Value +} + +type Fields []Field + +type Attributes []*tfprotov5.SchemaAttribute + +func (a Attributes) Len() int { return len(a) } +func (a Attributes) Swap(i, j int) { a[i], a[j] = a[j], a[i] } +func (a Attributes) Less(i, j int) bool { return a[i].Name < a[j].Name } + +func (f Fields) GetAttributesSchema() (attrs []*tfprotov5.SchemaAttribute) { + for _, field := range f { + if attr, ok := field.(*Attribute); ok { + attrs = append(attrs, attr.GetSchema()) + } + } + + // To make it easier to test we sort the attributes so the result will + // be deterministic + sort.Sort(Attributes(attrs)) + + return +} + +func (f Fields) GetBlocksSchema() (blocks []*tfprotov5.SchemaNestedBlock) { + for _, field := range f { + if block, ok := field.(*Block); ok { + blocks = append(blocks, block.GetSchema()) + } + } + + return +} + +type Attribute struct { + goName string + valueName string + asGo func(tftypes.Value, reflect.Value) error + asValue func(interface{}) tftypes.Value + _type tftypes.Type +} + +func (a Attribute) AsGo(val tftypes.Value, obj reflect.Value) error { + var v map[string]tftypes.Value + if err := val.As(&v); err != nil { + return err + } + return a.asGo(v[a.valueName], obj) +} + +func (a Attribute) AsValue(obj interface{}) tftypes.Value { + return a.asValue(obj) +} + +func (a Attribute) GetGoName() string { + return a.goName +} + +func (a Attribute) GetValueName() string { + return a.valueName +} + +func (a Attribute) GetSchema() *tfprotov5.SchemaAttribute { + return &tfprotov5.SchemaAttribute{ + Name: a.valueName, + Type: a._type, + + // This may not be expected as many attributes are actually required + // in a Nomad job definition but there are actually all set as + // optional in the field tags. While we could go over each of them + // manually to see whether or not they are required, it would be + // difficult to get right and time consuming to do manually for + // each new Nomad release. Worse it may evolve between two Nomad + // versions and the provider cannot always expect to speak to an + // up-to-date server so it may be detrimental to users to be overly + // strict in the schema, it's better to try to create the job and + // report a failure if something is missing than refusing to register + // a job that is actually correct. + Optional: true, + } +} + +type Block struct { + goName string + valueName string + asGo func(tftypes.Value, reflect.Value) error + asValue func(interface{}) tftypes.Value + mode tfprotov5.SchemaNestedBlockNestingMode + schema *tfprotov5.SchemaBlock +} + +func (b Block) AsGo(val tftypes.Value, obj reflect.Value) error { + var v map[string]tftypes.Value + if err := val.As(&v); err != nil { + return err + } + return b.asGo(v[b.valueName], obj) +} + +func (b Block) AsValue(obj interface{}) tftypes.Value { + return b.asValue(obj) +} + +func (b Block) GetGoName() string { + return b.goName +} + +func (b Block) GetValueName() string { + return b.valueName +} + +func (b Block) GetSchema() *tfprotov5.SchemaNestedBlock { + return &tfprotov5.SchemaNestedBlock{ + TypeName: b.valueName, + Nesting: b.mode, + Block: b.schema, + } +} + +// Storing all attributes builders in this map will help make sure that we +// test them all in the tests +var attributeBuilder = map[string]func(string, string) *Attribute{ + "string": NewStringAttribute, + "*string": NewStringAttribute, + "time.Duration": NewStringAttribute, + "*time.Duration": NewStringAttribute, + "api.CSIPluginType": NewStringAttribute, + "int": NewNumberAttribute, + "*int": NewNumberAttribute, + "*int8": NewNumberAttribute, + "*uint64": NewNumberAttribute, + "*int64": NewNumberAttribute, + "uint8": NewNumberAttribute, + "bool": NewBoolAttribute, + "*bool": NewBoolAttribute, + "[]string": NewStringListAttribute, + "map[string]interface {}": NewInterfaceMapAttribute, + "map[string]string": NewStringMapAttribute, + "map[string][]string": NewStringListMapAttribute, + "map[string]*api.VolumeRequest": NewVolumeMapAttribute, + "map[string]*api.ConsulGatewayBindAddress": NewConsulMapAttribute, +} + +func NewAttribute(t reflect.Type, goName, valueName string) (*Attribute, error) { + if builder, ok := attributeBuilder[t.String()]; ok { + return builder(goName, valueName), nil + } + return nil, fmt.Errorf("unknown type %q", t.String()) +} + +func NewStringMapAttribute(goName, valueName string) *Attribute { + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.Map{ + AttributeType: tftypes.String, + }, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var m map[string]tftypes.Value + if err := val.As(&m); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + + res := map[string]string{} + for name, v := range m { + var s string + if err := v.As(&s); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", v, err) + } + res[name] = s + } + + obj.Set(reflect.ValueOf(res)) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + var m map[string]tftypes.Value + + if obj != nil { + m = map[string]tftypes.Value{} + + for key, value := range obj.(map[string]string) { + v := tftypes.NewValue(tftypes.String, value) + m[key] = v + } + } + + return tftypes.NewValue( + tftypes.Map{ + AttributeType: tftypes.String, + }, + m, + ) + }, + } +} + +func NewStringAttribute(goName, valueName string) *Attribute { + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.String, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var s string + if err := val.As(&s); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + switch t := obj.Type().String(); t { + case "string", "api.CSIPluginType": + obj.SetString(s) + case "*string": + obj.Set(reflect.ValueOf(&s)) + case "time.Duration": + d, err := time.ParseDuration(s) + if err != nil { + return fmt.Errorf("failed to parse %q: %s", s, err) + } + obj.Set(reflect.ValueOf(d)) + case "*time.Duration": + if s == "" { + return nil + } + d, err := time.ParseDuration(s) + if err != nil { + return fmt.Errorf("failed to parse %q: %s", s, err) + } + obj.Set(reflect.ValueOf(&d)) + default: + return fmt.Errorf("unknown type %q", t) + } + + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + if obj == nil { + return tftypes.NewValue(tftypes.String, nil) + } + + switch o := obj.(type) { + case time.Duration: + return tftypes.NewValue(tftypes.String, o.String()) + case *time.Duration: + if o == nil { + return tftypes.NewValue(tftypes.String, "") + } + return tftypes.NewValue(tftypes.String, o.String()) + case api.CSIPluginType: + return tftypes.NewValue(tftypes.String, string(o)) + default: + return tftypes.NewValue(tftypes.String, o) + } + }, + } +} + +func NewNumberAttribute(goName, valueName string) *Attribute { + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.Number, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + var n big.Float + if err := val.As(&n); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + switch t := obj.Type().String(); t { + case "int": + i64, _ := n.Int64() + obj.SetInt(i64) + case "uint8": + u64, _ := n.Uint64() + obj.SetUint(u64) + case "*uint64": + i64, _ := n.Int64() + i := uint64(i64) + obj.Set(reflect.ValueOf(&i)) + case "*int8": + i64, _ := n.Int64() + i := int8(i64) + obj.Set(reflect.ValueOf(&i)) + case "*int64": + i64, _ := n.Int64() + obj.Set(reflect.ValueOf(&i64)) + case "*int": + i64, _ := n.Int64() + i := int(i64) + obj.Set(reflect.ValueOf(&i)) + default: + return fmt.Errorf("unknown type %q", t) + } + + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + return tftypes.NewValue(tftypes.Number, obj) + }, + } +} + +func NewBoolAttribute(goName, valueName string) *Attribute { + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.Bool, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var b bool + if err := val.As(&b); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + switch t := obj.Type().String(); t { + case "bool": + obj.SetBool(b) + case "*bool": + obj.Set(reflect.ValueOf(&b)) + default: + return fmt.Errorf("unknown type %q", t) + } + + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + return tftypes.NewValue(tftypes.Bool, obj) + }, + } +} + +func NewStringListAttribute(goName, valueName string) *Attribute { + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.List{ + ElementType: tftypes.String, + }, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var values []tftypes.Value + if err := val.As(&values); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + + l := []string{} + for _, v := range values { + var s string + if err := v.As(&s); err != nil { + return fmt.Errorf("failed to convert value %#v: %s", val, err) + } + l = append(l, s) + } + obj.Set(reflect.ValueOf(l)) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + ty := tftypes.List{ + ElementType: tftypes.String, + } + + if obj == nil { + return tftypes.NewValue(ty, nil) + } + + val := []tftypes.Value{} + for _, s := range obj.([]string) { + val = append(val, tftypes.NewValue(tftypes.String, s)) + } + return tftypes.NewValue(ty, val) + }, + } +} + +func NewInterfaceMapAttribute(goName, valueName string) *Attribute { + // This is another attribute a bit weird: in a Nomad job spec, + // both the driver 'config' stanza and the autoscaling 'policy' + // are completely opaque to Nomad and given as is to the plugin. + // It's a block, and may have any attributes of any type. + // Looking at the code of tfprotov5 it seems to me that the + // only thing that can have unknown keys is a map, but the value + // all need to be the same type in tfprotov5 so we can't have + // a schema for this: + // config { + // image = "hashicorp/http-echo" + // args = ["-text", "hello"] + // } + // Because of this we will write those fields as a JSON string + // in the configuration and have a custom converter for them. + // Looking at the code for tfprotov6, it looks like it would be + // possible to lift these restrictions with it, but + // terraform-plugin-mux does not support it yet so we will have + // to improve this later + + return &Attribute{ + goName: goName, + valueName: valueName, + _type: tftypes.String, + asGo: func(val tftypes.Value, obj reflect.Value) error { + var s string + if err := val.As(&s); err != nil { + return err + } + + var c map[string]interface{} + if err := json.Unmarshal([]byte(s), &c); err != nil { + return err + } + obj.Set(reflect.ValueOf(c)) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + s, _ := json.Marshal(obj) + return tftypes.NewValue(tftypes.String, string(s)) + }, + } +} + +func NewStringListMapAttribute(goName, valueName string) *Attribute { + ty := tftypes.Map{ + AttributeType: tftypes.List{ + ElementType: tftypes.String, + }, + } + + return &Attribute{ + goName: goName, + valueName: valueName, + _type: ty, + asGo: func(val tftypes.Value, obj reflect.Value) error { + c := map[string][]string{} + var m map[string]tftypes.Value + if err := val.As(&m); err != nil { + return err + } + + for key, value := range m { + l := []string{} + var values []tftypes.Value + if err := value.As(&values); err != nil { + return err + } + + for _, v := range values { + var s string + if err := v.As(&s); err != nil { + return err + } + l = append(l, s) + } + + c[key] = l + } + + obj.Set(reflect.ValueOf(c)) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + if obj == nil { + return tftypes.NewValue(ty, nil) + } + + m := map[string]tftypes.Value{} + + for key, value := range obj.(map[string][]string) { + val := []tftypes.Value{} + for _, v := range value { + val = append(val, tftypes.NewValue(tftypes.String, v)) + } + m[key] = tftypes.NewValue(ty.AttributeType, val) + } + + return tftypes.NewValue(ty, m) + }, + } +} + +func NewVolumeMapAttribute(goName, valueName string) *Attribute { + ty := tftypes.Map{ + AttributeType: tftypes.Object{ + AttributeTypes: map[string]tftypes.Type{ + "type": tftypes.String, + "source": tftypes.String, + "read_only": tftypes.Bool, + "access_mode": tftypes.String, + "attachment_mode": tftypes.String, + "per_alloc": tftypes.Bool, + }, + OptionalAttributes: map[string]struct{}{ + "type": {}, + "source": {}, + "read_only": {}, + "access_mode": {}, + "attachment_mode": {}, + "per_alloc": {}, + }, + }, + } + return &Attribute{ + goName: goName, + valueName: valueName, + _type: ty, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var v map[string]tftypes.Value + if err := val.As(&v); err != nil { + return err + } + + res := map[string]*api.VolumeRequest{} + for key, item := range v { + var i map[string]tftypes.Value + if err := item.As(&i); err != nil { + return err + } + + var ty, source, access_mode, attachment_mode string + if err := i["type"].As(&ty); err != nil { + return err + } + if err := i["source"].As(&source); err != nil { + return err + } + if err := i["access_mode"].As(&access_mode); err != nil { + return err + } + if err := i["attachment_mode"].As(&attachment_mode); err != nil { + return err + } + + var read_only, per_alloc bool + if err := i["read_only"].As(&read_only); err != nil { + return err + } + if err := i["per_alloc"].As(&per_alloc); err != nil { + return err + } + + res[key] = &api.VolumeRequest{ + Name: key, + Type: ty, + Source: source, + AccessMode: access_mode, + AttachmentMode: attachment_mode, + ReadOnly: read_only, + PerAlloc: per_alloc, + } + } + obj.Set(reflect.ValueOf(res)) + + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + if obj == nil { + return tftypes.NewValue(ty, nil) + } + + res := map[string]tftypes.Value{} + for key, vol := range obj.(map[string]*api.VolumeRequest) { + v := map[string]tftypes.Value{ + "type": tftypes.NewValue(tftypes.String, vol.Type), + "source": tftypes.NewValue(tftypes.String, vol.Source), + "read_only": tftypes.NewValue(tftypes.Bool, vol.ReadOnly), + "access_mode": tftypes.NewValue(tftypes.String, vol.AccessMode), + "attachment_mode": tftypes.NewValue(tftypes.String, vol.AttachmentMode), + "per_alloc": tftypes.NewValue(tftypes.Bool, vol.PerAlloc), + } + res[key] = tftypes.NewValue(ty.AttributeType, v) + } + + return tftypes.NewValue(ty, res) + }, + } +} + +func NewConsulMapAttribute(goName, valueName string) *Attribute { + ty := tftypes.Map{ + AttributeType: tftypes.Object{ + AttributeTypes: map[string]tftypes.Type{ + "address": tftypes.String, + "port": tftypes.Number, + }, + }, + } + return &Attribute{ + goName: goName, + valueName: valueName, + _type: ty, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + var v map[string]tftypes.Value + if err := val.As(&v); err != nil { + return err + } + + res := map[string]*api.ConsulGatewayBindAddress{} + for key, item := range v { + var i map[string]tftypes.Value + if err := item.As(&i); err != nil { + return err + } + + var address string + var port big.Float + if err := i["address"].As(&address); err != nil { + return err + } + if err := i["port"].As(&port); err != nil { + return err + } + + p, _ := port.Int64() + + res[key] = &api.ConsulGatewayBindAddress{ + Name: key, + Address: address, + Port: int(p), + } + } + obj.Set(reflect.ValueOf(res)) + + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + if obj == nil { + return tftypes.NewValue(ty, nil) + } + + res := map[string]tftypes.Value{} + for key, addr := range obj.(map[string]*api.ConsulGatewayBindAddress) { + a := map[string]tftypes.Value{ + "address": tftypes.NewValue(tftypes.String, addr.Address), + "port": tftypes.NewValue(tftypes.Number, addr.Port), + } + res[key] = tftypes.NewValue(ty.AttributeType, a) + } + + return tftypes.NewValue(ty, res) + }, + } +} + +func NewBlock(val reflect.Type, goName, valueName string) (*Block, error) { + isSlice := val.Kind() == reflect.Slice + + if val.Kind() == reflect.Slice { + val = val.Elem() + if val.Kind() == reflect.Ptr { + val = val.Elem() + } + } + + labels, err := getTaggedFields("label", val) + if err != nil { + return nil, err + } + + hasLabels := len(labels) != 0 + + switch { + case hasLabels: + return NewMapBlock(val, goName, valueName) + case isSlice: + return NewListBlock(val, goName, valueName) + default: + return NewSingleBlock(val, goName, valueName) + } +} + +func NewSingleBlock(val reflect.Type, goName, valueName string) (*Block, error) { + c, err := NewConverter(val) + if err != nil { + return nil, err + } + + return &Block{ + goName: goName, + valueName: valueName, + mode: tfprotov5.SchemaNestedBlockNestingModeSingle, + schema: c.Schema, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + o := reflect.New(obj.Type().Elem()).Interface() + if err := c.AsGo(val, o); err != nil { + return err + } + obj.Set(reflect.ValueOf(o)) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + return c.AsValue(obj) + }, + }, nil +} + +func NewListBlock(val reflect.Type, goName, valueName string) (*Block, error) { + c, err := NewConverter(val) + if err != nil { + return nil, err + } + + return &Block{ + goName: goName, + valueName: valueName, + mode: tfprotov5.SchemaNestedBlockNestingModeList, + schema: c.Schema, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + // If the block can appear multiple time, we + // need to convert each of the sub-blocks, put them + // in a slice and store that in the object. + o := reflect.MakeSlice(obj.Type(), 0, 0) + + var v []tftypes.Value + if err := val.As(&v); err != nil { + return err + } + + var conv func(val tftypes.Value) error + if t := obj.Type().Elem(); t.Kind() == reflect.Ptr { + conv = func(val tftypes.Value) error { + e := reflect.New(t.Elem()) + if err := c.AsGo(val, e.Interface()); err != nil { + return err + } + o = reflect.Append(o, e) + return nil + } + } else { + conv = func(val tftypes.Value) error { + e := reflect.New(t) + if err := c.AsGo(val, e.Interface()); err != nil { + return err + } + o = reflect.Append(o, e.Elem()) + return nil + } + } + + for _, val := range v { + if err := conv(val); err != nil { + return err + } + } + + obj.Set(o) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + val := []tftypes.Value{} + + if obj != nil { + o := reflect.ValueOf(obj) + + for i := 0; i < o.Len(); i++ { + v := reflect.Indirect(o.Index(i)) + val = append(val, c.AsValue(v.Interface())) + } + } + + return tftypes.NewValue( + tftypes.List{ElementType: c.AsValue(nil).Type()}, + val, + ) + }, + }, nil +} + +func NewMapBlock(val reflect.Type, goName, valueName string) (*Block, error) { + c, err := NewConverter(val) + if err != nil { + return nil, err + } + + return &Block{ + goName: goName, + valueName: valueName, + mode: tfprotov5.SchemaNestedBlockNestingModeMap, + schema: c.Schema, + asGo: func(val tftypes.Value, obj reflect.Value) error { + if val.IsNull() { + return nil + } + + // Since the block has labels, we need to parse each + // sub-block, add their labels to them, put them in a + // slice and use that as a value for the object + + var v map[string]tftypes.Value + err := val.As(&v) + if err != nil { + return err + } + + // We will store each sub-block in this slice + o := reflect.MakeSlice(obj.Type(), 0, 0) + + setLabel := func(label string, t reflect.Type, e reflect.Value) error { + fieldName, err := getLabelFieldName(t) + if err != nil { + return err + } + + labelField := e.Elem().FieldByName(fieldName) + if labelField.Kind() == reflect.Ptr { + labelField.Set(reflect.ValueOf(&label)) + } else { + labelField.SetString(label) + } + return nil + } + + conv := func(label string, val tftypes.Value) error { + t := obj.Type().Elem() + if t.Kind() == reflect.Ptr { + t = t.Elem() + } + e := reflect.New(t) + if err := setLabel(label, t, e); err != nil { + return err + } + if err := c.AsGo(val, e.Interface()); err != nil { + return err + } + if obj.Type().Elem().Kind() == reflect.Ptr { + o = reflect.Append(o, e) + } else { + o = reflect.Append(o, e.Elem()) + } + return nil + } + + for label, val := range v { + if err := conv(label, val); err != nil { + return err + } + } + + obj.Set(o) + return nil + }, + asValue: func(obj interface{}) tftypes.Value { + val := map[string]tftypes.Value{} + + if obj != nil { + o := reflect.ValueOf(obj) + + for i := 0; i < o.Len(); i++ { + v := reflect.Indirect(o.Index(i)) + fieldName, _ := getLabelFieldName(v.Type()) + + labelField := v.FieldByName(fieldName) + + e := c.AsValue(v.Interface()) + val[reflect.Indirect(labelField).String()] = e + } + } + + return tftypes.NewValue( + tftypes.Map{ + AttributeType: c.AsValue(nil).Type(), + }, + val, + ) + }, + }, nil +} diff --git a/internal/protocolprovider/converter_test.go b/internal/protocolprovider/converter_test.go new file mode 100644 index 00000000..e9bafbd8 --- /dev/null +++ b/internal/protocolprovider/converter_test.go @@ -0,0 +1,349 @@ +package protocol + +import ( + "reflect" + "strings" + "testing" + "time" + + "github.com/hashicorp/nomad/api" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tftypes" + "github.com/stretchr/testify/require" +) + +// It is important for the conversion from HCL annotation to Terraform schema +// to be correct, since it would be extremely tedious to test all possible jobs +// configuration to make sure we cover all cases, we just use this struct in +// which all the types covered in the coverters are present. If it works +// properly for this struct, it should work without any issue for api.Job. +type TestStruct struct { + // Strings + String string `hcl:"string,optional"` + StringPtr *string `hcl:"stringptr,optional"` + StringPtrNil *string `hcl:"stringptrnil,optional"` + Duration time.Duration `hcl:"duration,optional"` + DurationPtr *time.Duration `hcl:"durationptr,optional"` + DurationPtrNil *time.Duration `hcl:"durationptrnil,optional"` + CSIPluginType api.CSIPluginType `hcl:"csiplugintype,optional"` + + // Numbers + Int int `hcl:"int,optional"` + IntPtr *int `hcl:"intptr,optional"` + IntPtrNil *int `hcl:"intptrnil,optional"` + Int8Ptr *int8 `hcl:"int8ptr,optional"` + Int8PtrNil *int8 `hcl:"int8ptrnil,optional"` + UInt64Ptr *uint64 `hcl:"uint64ptr,optional"` + UInt64PtrNil *uint64 `hcl:"uint64ptrnil,optional"` + Int64Ptr *int64 `hcl:"int64ptr,optional"` + Int64PtrNil *int64 `hcl:"int64ptrnil,optional"` + UInt8 uint8 `hcl:"uint8,optional"` + + // Bools + Bool bool `hcl:"bool,optional"` + BoolPtr *bool `hcl:"boolptr,optional"` + BoolPtrNil *bool `hcl:"boolptrnil,optional"` + + // Complex attributes + ListOfStrings []string `hcl:"listofstrings,optional"` + MapStringInterface map[string]interface{} `hcl:"mapstringinterface,optional"` + MapStringString map[string]string `hcl:"mapstringstring,optional"` + MapStringListOfString map[string][]string `hcl:"mapstringlistofstring,optional"` + MapStringVolumeRequest map[string]*api.VolumeRequest `hcl:"mapstringvolumerequest,optional"` + MapStringConsulGatewayBindAddress map[string]*api.ConsulGatewayBindAddress `hcl:"mapstringconsulgatewaybindaddress,optional"` +} + +func TestConverterSchema(t *testing.T) { + ty := reflect.TypeOf(TestStruct{}) + converter, err := NewConverter(ty) + require.NoError(t, err) + + expected := &tfprotov5.SchemaBlock{ + Version: 1, + Attributes: []*tfprotov5.SchemaAttribute{ + { + Name: "bool", + Type: tftypes.Bool, + Optional: true, + }, + { + Name: "boolptr", + Type: tftypes.Bool, + Optional: true, + }, + { + Name: "boolptrnil", + Type: tftypes.Bool, + Optional: true, + }, + { + Name: "csiplugintype", + Type: tftypes.String, + Optional: true, + }, + { + Name: "duration", + Type: tftypes.String, + Optional: true, + }, + { + Name: "durationptr", + Type: tftypes.String, + Optional: true, + }, + { + Name: "durationptrnil", + Type: tftypes.String, + Optional: true, + }, + { + Name: "int", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "int64ptr", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "int64ptrnil", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "int8ptr", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "int8ptrnil", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "intptr", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "intptrnil", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "listofstrings", + Type: tftypes.List{ + ElementType: tftypes.String, + }, + Optional: true, + }, + { + Name: "mapstringconsulgatewaybindaddress", + Type: tftypes.Map{ + AttributeType: tftypes.Object{ + AttributeTypes: map[string]tftypes.Type{ + "address": tftypes.String, + "port": tftypes.Number, + }, + }, + }, + Optional: true, + }, + { + Name: "mapstringinterface", + Type: tftypes.String, + Optional: true, + }, + { + Name: "mapstringlistofstring", + Type: tftypes.Map{ + AttributeType: tftypes.List{ + ElementType: tftypes.String, + }, + }, + Optional: true, + }, + { + Name: "mapstringstring", + Type: tftypes.Map{ + AttributeType: tftypes.String, + }, + Optional: true, + }, + { + Name: "mapstringvolumerequest", + Type: tftypes.Map{ + AttributeType: tftypes.Object{ + AttributeTypes: map[string]tftypes.Type{ + "type": tftypes.String, + "source": tftypes.String, + "read_only": tftypes.Bool, + "access_mode": tftypes.String, + "attachment_mode": tftypes.String, + "per_alloc": tftypes.Bool, + }, + OptionalAttributes: map[string]struct{}{ + "type": {}, + "source": {}, + "read_only": {}, + "access_mode": {}, + "attachment_mode": {}, + "per_alloc": {}, + }, + }, + }, + Optional: true, + }, + { + Name: "string", + Type: tftypes.String, + Optional: true, + }, + { + Name: "stringptr", + Type: tftypes.String, + Optional: true, + }, + { + Name: "stringptrnil", + Type: tftypes.String, + Optional: true, + }, + { + Name: "uint64ptr", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "uint64ptrnil", + Type: tftypes.Number, + Optional: true, + }, + { + Name: "uint8", + Type: tftypes.Number, + Optional: true, + }, + }, + BlockTypes: nil, + } + + require.Equal(t, expected, converter.Schema) + + // Make sure we have one attribute for each field in TestStruct + require.Equal(t, len(expected.Attributes), ty.NumField()) + + // Make sure we tested all attributes type + tested := map[string]struct{}{} + for i := 0; i < ty.NumField(); i++ { + field := ty.Field(i) + tested[field.Type.String()] = struct{}{} + } + missing := []string{} + for key := range attributeBuilder { + if _, ok := tested[key]; !ok { + missing = append(missing, key) + } + } + + // Make sure we have a Nil and a non Nil version of each pointers for the + // next test + found := map[string]struct { + Nil bool + NonNil bool + }{} + for i := 0; i < ty.NumField(); i++ { + field := ty.Field(i) + if field.Type.Kind() == reflect.Ptr { + name := strings.ReplaceAll(field.Name, "Nil", "") + v := found[name] + if strings.HasSuffix(field.Name, "Nil") { + v.Nil = true + } else { + v.NonNil = true + } + found[name] = v + } + } + for name, result := range found { + if !result.Nil || !result.NonNil { + t.Fatalf("Missing some version for %q: %+v", name, result) + } + } + + require.Emptyf(t, missing, "Some types have not been tested") +} + +func TestConverterRoundtrip(t *testing.T) { + s := "foo" + d, err := time.ParseDuration("1m") + require.NoError(t, err) + i := 1 + i8 := int8(8) + ui8 := uint8(8) + ui64 := uint64(64) + i64 := int64(64) + b := true + + obj := TestStruct{ + String: s, + StringPtr: &s, + Duration: d, + DurationPtr: &d, + CSIPluginType: api.CSIPluginTypeNode, + Int: i, + IntPtr: &i, + Int8Ptr: &i8, + UInt64Ptr: &ui64, + Int64Ptr: &i64, + UInt8: ui8, + Bool: b, + BoolPtr: &b, + MapStringInterface: map[string]interface{}{ + "driver": "test", + "port": []interface{}{float64(1), float64(2)}, + }, + MapStringVolumeRequest: map[string]*api.VolumeRequest{ + "test": { + Name: "test", + Type: "foo", + }, + }, + ListOfStrings: []string{}, + MapStringString: map[string]string{}, + MapStringListOfString: map[string][]string{}, + MapStringConsulGatewayBindAddress: map[string]*api.ConsulGatewayBindAddress{ + "test": { + Name: "test", + Address: "foo", + Port: 80, + }, + }, + } + converter, err := NewConverter(reflect.TypeOf(obj)) + require.NoError(t, err) + + // Make sure our conversion roundtrip + var obj2 TestStruct + err = converter.AsGo(converter.AsValue(obj), &obj2) + require.NoError(t, err) + require.Equal(t, obj, obj2) + + // Make sure our object had correct values to test all code paths + o := reflect.ValueOf(obj) + for i := 0; i < o.NumField(); i++ { + name := o.Type().Field(i).Name + field := o.FieldByName(name) + if field.Kind() == reflect.Ptr { + if strings.HasSuffix(name, "Nil") { + require.True(t, field.IsNil(), "pointer %q must be nil", name) + } else { + require.False(t, field.IsNil(), "pointer %q must be non-nil", name) + require.False(t, reflect.Indirect(field).IsZero(), "value pointed by %q should not be the default", name) + } + } else { + require.False(t, field.IsZero(), "field %q should not be set to their default value", name) + } + } +} diff --git a/internal/protocolprovider/data_router.go b/internal/protocolprovider/data_router.go new file mode 100644 index 00000000..29cc2730 --- /dev/null +++ b/internal/protocolprovider/data_router.go @@ -0,0 +1,31 @@ +package protocol + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-go/tfprotov5" +) + +type errUnsupportedDataSource string + +func (e errUnsupportedDataSource) Error() string { + return "unsupported data source: " + string(e) +} + +type dataSourceRouter map[string]tfprotov5.DataSourceServer + +func (d dataSourceRouter) ValidateDataSourceConfig(ctx context.Context, req *tfprotov5.ValidateDataSourceConfigRequest) (*tfprotov5.ValidateDataSourceConfigResponse, error) { + ds, ok := d[req.TypeName] + if !ok { + return nil, errUnsupportedDataSource(req.TypeName) + } + return ds.ValidateDataSourceConfig(ctx, req) +} + +func (d dataSourceRouter) ReadDataSource(ctx context.Context, req *tfprotov5.ReadDataSourceRequest) (*tfprotov5.ReadDataSourceResponse, error) { + ds, ok := d[req.TypeName] + if !ok { + return nil, errUnsupportedDataSource(req.TypeName) + } + return ds.ReadDataSource(ctx, req) +} diff --git a/internal/protocolprovider/job.go b/internal/protocolprovider/job.go new file mode 100644 index 00000000..da3b9256 --- /dev/null +++ b/internal/protocolprovider/job.go @@ -0,0 +1,426 @@ +package protocol + +import ( + "context" + "encoding/json" + "fmt" + "strings" + + "github.com/hashicorp/nomad/api" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +type nomadJob struct { + converter *Converter + s *server +} + +func (j nomadJob) Apply(modifyIndex uint64, job *api.Job) error { + _, _, err := j.s.getClient().Jobs().EnforceRegister(job, modifyIndex, nil) + return err +} + +func (j nomadJob) Read(id string) (*api.Job, error) { + job, _, err := j.s.getClient().Jobs().Info(id, nil) + + if err != nil && strings.Contains(err.Error(), "404") { + return nil, nil + } + + return job, err +} + +func (j nomadJob) Destroy(id string) error { + _, _, err := j.s.getClient().Jobs().Deregister(id, true, nil) + return err +} + +func (j nomadJob) unmarshal(state *tfprotov5.DynamicValue) (string, *api.Job, error) { + schema := j.Schema(false) + _, v, err := unmarshalDynamicValueObject(state, schema) + if err != nil { + return "", nil, fmt.Errorf("error while decoding state: %s", err) + } + + var id string + if err := v["id"].As(&id); err != nil { + return "", nil, fmt.Errorf("failed to decode id: %s", err) + } + + var val map[string]tftypes.Value + if err := v["job"].As(&val); err != nil { + return "", nil, fmt.Errorf("failed to decode job: %s", err) + } + + if len(val) > 1 { + return "", nil, fmt.Errorf("wrong number of jobs found: %#v", val) + } + job := &api.Job{} + for ID, v := range val { + if err := j.converter.AsGo(v, job); err != nil { + return "", nil, fmt.Errorf("failed to convert job: %s", err) + } + // We now override the ID here, it means that the user could set some + // weird configuration like + // + // resource "nomad_job_v2" "test" { + // job "foo" { + // id = "bar" + // // ... + // } + // } + // + // and the "bar" ID would be overwritten by "foo" but this is how the + // Nomad CLI client works too so it's not an issue as long as we are + // consistent + job.ID = &ID + } + + return id, job, nil +} + +func (j nomadJob) ReadResource(_ context.Context, req *tfprotov5.ReadResourceRequest) (*tfprotov5.ReadResourceResponse, error) { + id, _, err := j.unmarshal(req.CurrentState) + if err != nil { + return nil, err + } + + var diff api.JobDiff + if len(req.Private) > 0 { + var p private + if err = json.Unmarshal(req.Private, &p); err != nil { + return nil, err + } + config := &tfprotov5.DynamicValue{ + MsgPack: p.Config, + } + _, job, err := j.unmarshal(config) + if err != nil { + return nil, err + } + plan, _, err := j.s.getClient().Jobs().Plan(job, true, nil) + if err != nil { + return nil, err + } + diff = *plan.Diff + } + + job, err := j.Read(id) + if err != nil { + return nil, err + } + if job == nil { + // The job does not exist anymore, we return an empty state to signal it + return &tfprotov5.ReadResourceResponse{ + Private: req.Private, + }, nil + } + + // Export the read job in the 'out' attribute + schema := j.Schema(false) + val, err := req.CurrentState.Unmarshal(schema) + if err != nil { + return nil, err + } + var v map[string]tftypes.Value + if err = val.As(&v); err != nil { + return nil, err + } + + out := j.converter.AsValue(job) + jobValue := v["job"] + if hasChanges(diff) { + jobValue = tftypes.NewValue( + schema.AttributeTypes["job"], + map[string]tftypes.Value{ + *job.ID: out, + }, + ) + } + + val = tftypes.NewValue(schema, map[string]tftypes.Value{ + "id": tftypes.NewValue(tftypes.String, *job.ID), + "job": jobValue, + "out": out, + }) + state, err := tfprotov5.NewDynamicValue(schema, val) + if err != nil { + return nil, fmt.Errorf("foo: %s", err) + } + + return &tfprotov5.ReadResourceResponse{ + NewState: &state, + Private: req.Private, + }, nil +} + +func hasChanges(diff api.JobDiff) bool { + if len(diff.Fields)+len(diff.Objects) > 0 { + return true + } + + for _, group := range diff.TaskGroups { + if len(group.Fields)+len(group.Objects) > 0 { + return true + } + + for _, task := range group.Tasks { + if len(task.Fields)+len(task.Objects) > 0 { + return true + } + } + } + + return false +} + +type private struct { + JobModifyIndex uint64 + Config []byte +} + +func (j nomadJob) PlanResourceChange(_ context.Context, req *tfprotov5.PlanResourceChangeRequest) (*tfprotov5.PlanResourceChangeResponse, error) { + oldID, oldJob, err := j.unmarshal(req.PriorState) + if err != nil { + return nil, err + } + + _, job, err := j.unmarshal(req.ProposedNewState) + if err != nil { + return nil, err + } + + state := *req.Config + schema := j.Schema(false) + val, err := req.Config.Unmarshal(schema) + if err != nil { + return nil, err + } + var v map[string]tftypes.Value + if err = val.As(&v); err != nil { + return nil, err + } + configJob := v["job"] + + val, err = req.PriorState.Unmarshal(schema) + if err != nil { + return nil, err + } + if err = val.As(&v); err != nil { + return nil, err + } + priorJob := v["job"] + + out := tftypes.NewValue(tftypes.DynamicPseudoType, tftypes.UnknownValue) + if configJob.Equal(priorJob) { + val, err = req.ProposedNewState.Unmarshal(schema) + if err != nil { + return nil, err + } + if err = val.As(&v); err != nil { + return nil, err + } + out = v["out"] + } + + // When the job is created for the first time the ID will be empty, so we + // fill it in during the plan. We also mark 'out' as unknow since it will + // change. + val = tftypes.NewValue(schema, map[string]tftypes.Value{ + "id": tftypes.NewValue(tftypes.String, *job.ID), + "job": configJob, + "out": out, + }) + state, err = tfprotov5.NewDynamicValue(schema, val) + if err != nil { + return nil, err + } + + p := private{ + Config: req.Config.MsgPack, + } + + if oldID != "" { + _, job, err = j.unmarshal(req.Config) + if err != nil { + return nil, err + } + + plan, _, err := j.s.getClient().Jobs().Plan(job, false, nil) + if err != nil { + return nil, fmt.Errorf("foobar: %s", err) + } + + p.JobModifyIndex = plan.JobModifyIndex + } + + private, err := json.Marshal(p) + if err != nil { + return nil, err + } + + return &tfprotov5.PlanResourceChangeResponse{ + PlannedState: &state, + PlannedPrivate: private, + RequiresReplace: requiresReplace(oldJob, job), + }, nil +} + +func requiresReplace(old, new *api.Job) []*tftypes.AttributePath { + // This conditions needs to be kept in sync with + // https://github.com/hashicorp/nomad/blob/402b19c3b0e824e96e8118f66906f7d89d0b6a2c/nomad/job_endpoint.go#L1811-L1846 + // Maybe this is returned during the plan but I did not find it + + res := []*tftypes.AttributePath{} + path := tftypes.NewAttributePath().WithAttributeName("job").WithElementKeyString(*new.ID) + + // Type transitions are disallowed + if old.Type != new.Type && old.Type != nil && *old.Type != "" { + res = append(res, path.WithAttributeName("type")) + } + + // Transitioning to/from periodic is disallowed + if old.IsPeriodic() && !new.IsPeriodic() { + res = append(res, path.WithAttributeName("periodic")) + } + if new.IsPeriodic() && !old.IsPeriodic() { + res = append(res, path.WithAttributeName("periodic")) + } + + // Transitioning to/from parameterized is disallowed + if old.IsParameterized() && !new.IsParameterized() { + res = append(res, path.WithAttributeName("parameterized")) + } + if new.IsParameterized() && !old.IsParameterized() { + res = append(res, path.WithAttributeName("parameterized")) + } + + if old.ID != new.ID { + res = append(res, tftypes.NewAttributePath().WithAttributeName("id")) + } + + return res +} + +func (j nomadJob) ApplyResourceChange(_ context.Context, req *tfprotov5.ApplyResourceChangeRequest) (*tfprotov5.ApplyResourceChangeResponse, error) { + id, _, err := j.unmarshal(req.PriorState) + if err != nil { + return nil, err + } + + // If there is no planned state, it means we must destroy the resource + if val, err := req.PlannedState.Unmarshal(tftypes.DynamicPseudoType); err == nil && val.IsNull() { + err := j.Destroy(id) + return &tfprotov5.ApplyResourceChangeResponse{ + NewState: req.PlannedState, + Diagnostics: wrap(err, "Failed to deregister job"), + }, nil + } + + _, job, err := j.unmarshal(req.Config) + if err != nil { + return nil, err + } + + var p private + if err := json.Unmarshal(req.PlannedPrivate, &p); err != nil { + return nil, err + } + + if err = j.Apply(p.JobModifyIndex, job); err != nil { + return &tfprotov5.ApplyResourceChangeResponse{ + Diagnostics: wrap(err, "Failed to register job"), + }, nil + } + + job, err = j.Read(*job.ID) + if err != nil { + return nil, err + } + + // We must set the ID and 'out' in the new state + schema := j.Schema(false) + val, err := req.PlannedState.Unmarshal(schema) + if err != nil { + return nil, err + } + var v map[string]tftypes.Value + if err = val.As(&v); err != nil { + return nil, err + } + val = tftypes.NewValue(schema, map[string]tftypes.Value{ + "id": tftypes.NewValue(tftypes.String, *job.ID), + "job": v["job"], + "out": j.converter.AsValue(job), + }) + s, err := tfprotov5.NewDynamicValue(schema, val) + if err != nil { + return nil, err + } + + return &tfprotov5.ApplyResourceChangeResponse{ + NewState: &s, + Private: req.PlannedPrivate, + }, nil +} + +func (j nomadJob) Schema(markAttributesAsOptional bool) tftypes.Object { + return schemaAsObject(j.s.resourceSchemas["nomad_job_v2"], markAttributesAsOptional) +} + +func (j nomadJob) ValidateResourceTypeConfig(_ context.Context, req *tfprotov5.ValidateResourceTypeConfigRequest) (*tfprotov5.ValidateResourceTypeConfigResponse, error) { + return &tfprotov5.ValidateResourceTypeConfigResponse{}, nil +} + +func (j nomadJob) UpgradeResourceState(_ context.Context, req *tfprotov5.UpgradeResourceStateRequest) (*tfprotov5.UpgradeResourceStateResponse, error) { + schema := j.Schema(false) + rawStateObject, err := req.RawState.Unmarshal(schema) + if err != nil { + return nil, err + } + + rawStateValue, err := tfprotov5.NewDynamicValue(schema, rawStateObject) + + return &tfprotov5.UpgradeResourceStateResponse{ + UpgradedState: &rawStateValue, + }, err +} + +func (j nomadJob) ImportResourceState(_ context.Context, req *tfprotov5.ImportResourceStateRequest) (*tfprotov5.ImportResourceStateResponse, error) { + job, err := j.Read(req.ID) + if err != nil { + return &tfprotov5.ImportResourceStateResponse{ + Diagnostics: wrap(err, "Failed to import job"), + }, nil + } + + schema := j.Schema(false) + val := j.converter.AsValue(job) + val = tftypes.NewValue( + schema, + map[string]tftypes.Value{ + "id": tftypes.NewValue(tftypes.String, *job.ID), + "job": tftypes.NewValue( + schema.AttributeTypes["job"], + map[string]tftypes.Value{ + *job.ID: val, + }, + ), + "out": val, + }, + ) + state, err := tfprotov5.NewDynamicValue(schema, val) + if err != nil { + return nil, err + } + + return &tfprotov5.ImportResourceStateResponse{ + ImportedResources: []*tfprotov5.ImportedResource{ + { + TypeName: req.TypeName, + State: &state, + }, + }, + }, nil +} diff --git a/internal/protocolprovider/job_test.go b/internal/protocolprovider/job_test.go new file mode 100644 index 00000000..388f7f80 --- /dev/null +++ b/internal/protocolprovider/job_test.go @@ -0,0 +1,386 @@ +package protocol + +import ( + "context" + "fmt" + "os" + "regexp" + "strings" + "testing" + + "github.com/hashicorp/nomad/api" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + tfmux "github.com/hashicorp/terraform-plugin-mux" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-provider-nomad/nomad" + "github.com/stretchr/testify/require" +) + +var testAccProtoV5ProviderFactories = map[string]func() (tfprotov5.ProviderServer, error){} + +func init() { + if v := os.Getenv("NOMAD_ADDR"); v == "" { + os.Setenv("NOMAD_ADDR", "http://127.0.0.1:4646") + } + + testAccProtoV5ProviderFactories["nomad"] = func() (tfprotov5.ProviderServer, error) { + ctx := context.Background() + + // the ProviderServer from SDKv2 + sdkv2 := nomad.Provider() + + // the terraform-plugin-go provider + tpg := Server(sdkv2) + + factory, err := tfmux.NewSchemaServerFactory(ctx, sdkv2.GRPCProvider, tpg) + if err != nil { + return nil, err + } + return factory.Server(), nil + } +} + +func TestAccResourceJob(t *testing.T) { + resource.UnitTest(t, resource.TestCase{ + ProtoV5ProviderFactories: testAccProtoV5ProviderFactories, + CheckDestroy: testJobIsAbsent("test-nomad-job-v2"), + Steps: []resource.TestStep{ + { + PreConfig: createTestJob(t), + Config: testAccNomadJob, + ExpectError: regexp.MustCompile("Enforcing job modify index 0"), + }, + { + PreConfig: removeJob(t, "test-nomad-job-v2"), + Config: testAccNomadJob, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("nomad_job_v2.test", "id", "test-nomad-job-v2"), + testJobIsPresent("test-nomad-job-v2"), + // The out object should contain the expanded job configuration + // after it has been applied + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.#", "2"), + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.0", "leader"), + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.1", "mysql"), + ), + }, + { + // Trying to change to a tag and getting the correct result in + // 'out' ensure that we set it correctly during the plan + Config: testAccNomadJobChangeTag, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.#", "1"), + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.0", "leader"), + ), + }, + { + // When the job has been externally removed, Terraform should + // detect it and create it again + PreConfig: removeJob(t, "test-nomad-job-v2"), + Config: testAccNomadJobChangeTag, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.#", "1"), + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.group.cache.service.0.tags.0", "leader"), + ), + }, + { + // When a Job is changed externally the change should be + // detected and a plan should be created + PreConfig: changePriority(t, "test-nomad-job-v2", 75), + Config: testAccNomadJobChangeTag, + PlanOnly: true, + ExpectNonEmptyPlan: true, + }, + { + Config: testAccNomadJobChangeId, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("nomad_job_v2.test", "id", "test-nomad-job-v2-change-id"), + testJobIsAbsent("test-nomad-job-v2"), + testJobIsPresent("test-nomad-job-v2-change-id"), + ), + }, + { + Config: testAccNomadJobChangeType, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("nomad_job_v2.test", "out.type", "system"), + ), + }, + { + ResourceName: "nomad_job_v2.test", + ImportState: true, + }, + }, + }) +} + +func createTestJob(t *testing.T) func() { + return func() { + client, err := api.NewClient(api.DefaultConfig()) + require.NoError(t, err) + job := api.NewServiceJob("test-nomad-job-v2", "test-nomad-job-v2", "", 50) + job.AddDatacenter("dc1") + task := api.NewTask("test", "exec") + job.AddTaskGroup(api.NewTaskGroup("test", 1).AddTask(task)) + _, _, err = client.Jobs().Register(job, nil) + require.NoError(t, err) + } +} + +func getJob(name string) (*api.Job, error) { + client, err := api.NewClient(api.DefaultConfig()) + if err != nil { + return nil, fmt.Errorf("failed to instantiate test client: %s", err) + } + job, _, err := client.Jobs().Info(name, nil) + if err != nil { + if strings.Contains(err.Error(), "404") { + return nil, nil + } + return nil, fmt.Errorf("error while looking for %q: %s", name, err) + } + + return job, nil +} + +func testJobIsAbsent(name string) func(*terraform.State) error { + return func(s *terraform.State) error { + job, err := getJob(name) + if err != nil { + return err + } + if job != nil { + return fmt.Errorf("Job %q is still present.", name) + } + return nil + } +} + +func testJobIsPresent(name string) func(*terraform.State) error { + return func(s *terraform.State) error { + job, err := getJob(name) + if err != nil { + return err + } + if job == nil { + return fmt.Errorf("Job %q is absent", name) + } + return nil + } +} + +func changePriority(t *testing.T, name string, priority int) func() { + return func() { + client, err := api.NewClient(api.DefaultConfig()) + if err != nil { + t.Fatalf("failed to instantiate test client: %s", err) + } + job, _, err := client.Jobs().Info(name, nil) + if err != nil { + t.Fatalf("failed to fetch job: %s", err) + } + job.Priority = &priority + _, _, err = client.Jobs().Register(job, nil) + if err != nil { + t.Fatalf("failed to update job: %s", err) + } + } +} + +func removeJob(t *testing.T, name string) func() { + return func() { + client, err := api.NewClient(api.DefaultConfig()) + if err != nil { + t.Fatalf("failed to instanciate test client: %s", err) + } + _, _, err = client.Jobs().Deregister(name, true, nil) + if err != nil { + t.Fatalf("failed to remove %s: %s", name, err) + } + } +} + +const testAccNomadJob = ` +resource "nomad_job_v2" "test" { + job "test-nomad-job-v2" { + + type = "service" + datacenters = ["dc1"] + + meta = { + foo = "bar" + } + + group "cache" { + + service { + tags = ["leader", "mysql"] + + port = "db" + + meta = { + meta = "for your service" + } + } + + network { + port "db" { + to = 6379 + } + } + + task "redis" { + driver = "docker" + + service { + tags = ["leader", "mysql"] + + port = "db" + + meta = { + meta = "for your service" + } + + check { + type = "http" + port = "db" + path = "/_healthz" + interval = "5s" + timeout = "2s" + header = { + Authorization = ["Basic ZWxhc3RpYzpjaGFuZ2VtZQ=="] + } + } + + } + + config = jsonencode({ + image = "redis:3.2" + + ports = ["db"] + }) + + resources { + cpu = 500 + memory = 256 + } + } + } + } + } +` + +const testAccNomadJobChangeTag = ` +resource "nomad_job_v2" "test" { + job "test-nomad-job-v2" { + + type = "service" + datacenters = ["dc1"] + + meta = { + foo = "bar" + } + + group "cache" { + + service { + tags = ["leader"] + + port = "db" + + meta = { + meta = "for your service" + } + } + + network { + port "db" { + to = 6379 + } + } + + task "redis" { + driver = "docker" + + service { + tags = ["leader"] + + port = "db" + + meta = { + meta = "for your service" + } + + check { + type = "http" + port = "db" + path = "/_healthz" + interval = "5s" + timeout = "2s" + header = { + Authorization = ["Basic ZWxhc3RpYzpjaGFuZ2VtZQ=="] + } + } + + } + + config = jsonencode({ + image = "redis:3.2" + + ports = ["db"] + }) + + resources { + cpu = 500 + memory = 256 + } + } + } + } + } +` + +const testAccNomadJobChangeId = ` +resource "nomad_job_v2" "test" { + job "test-nomad-job-v2-change-id" { + type = "service" + datacenters = ["dc1"] + + + group "cache" { + + task "redis" { + driver = "docker" + + config = jsonencode({ + image = "redis:3.2" + + ports = ["db"] + }) + } + } + } + } +` + +const testAccNomadJobChangeType = ` +resource "nomad_job_v2" "test" { + job "test-nomad-job-v2-change-id" { + type = "system" + datacenters = ["dc1"] + + + group "cache" { + + task "redis" { + driver = "docker" + + config = jsonencode({ + image = "redis:3.2" + + ports = ["db"] + }) + } + } + } + } +` diff --git a/internal/protocolprovider/resource_router.go b/internal/protocolprovider/resource_router.go new file mode 100644 index 00000000..51fd7b8c --- /dev/null +++ b/internal/protocolprovider/resource_router.go @@ -0,0 +1,63 @@ +package protocol + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-go/tfprotov5" +) + +type errUnsupportedResource string + +func (e errUnsupportedResource) Error() string { + return "unsupported resource: " + string(e) +} + +type resourceRouter map[string]tfprotov5.ResourceServer + +func (r resourceRouter) ValidateResourceTypeConfig(ctx context.Context, req *tfprotov5.ValidateResourceTypeConfigRequest) (*tfprotov5.ValidateResourceTypeConfigResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.ValidateResourceTypeConfig(ctx, req) +} + +func (r resourceRouter) UpgradeResourceState(ctx context.Context, req *tfprotov5.UpgradeResourceStateRequest) (*tfprotov5.UpgradeResourceStateResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.UpgradeResourceState(ctx, req) +} + +func (r resourceRouter) ReadResource(ctx context.Context, req *tfprotov5.ReadResourceRequest) (*tfprotov5.ReadResourceResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.ReadResource(ctx, req) +} + +func (r resourceRouter) PlanResourceChange(ctx context.Context, req *tfprotov5.PlanResourceChangeRequest) (*tfprotov5.PlanResourceChangeResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.PlanResourceChange(ctx, req) +} + +func (r resourceRouter) ApplyResourceChange(ctx context.Context, req *tfprotov5.ApplyResourceChangeRequest) (*tfprotov5.ApplyResourceChangeResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.ApplyResourceChange(ctx, req) +} + +func (r resourceRouter) ImportResourceState(ctx context.Context, req *tfprotov5.ImportResourceStateRequest) (*tfprotov5.ImportResourceStateResponse, error) { + res, ok := r[req.TypeName] + if !ok { + return nil, errUnsupportedResource(req.TypeName) + } + return res.ImportResourceState(ctx, req) +} diff --git a/internal/protocolprovider/server.go b/internal/protocolprovider/server.go new file mode 100644 index 00000000..3da56487 --- /dev/null +++ b/internal/protocolprovider/server.go @@ -0,0 +1,97 @@ +package protocol + +import ( + "context" + "reflect" + + "github.com/hashicorp/nomad/api" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tftypes" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-nomad/nomad" +) + +type server struct { + err error + provider *schema.Provider + + resourceSchemas map[string]*tfprotov5.Schema + + resourceRouter + dataSourceRouter +} + +func (s server) GetProviderSchema(ctx context.Context, req *tfprotov5.GetProviderSchemaRequest) (*tfprotov5.GetProviderSchemaResponse, error) { + return &tfprotov5.GetProviderSchemaResponse{ + ResourceSchemas: s.resourceSchemas, + }, s.err +} + +func (s server) PrepareProviderConfig(ctx context.Context, req *tfprotov5.PrepareProviderConfigRequest) (*tfprotov5.PrepareProviderConfigResponse, error) { + return nil, nil +} + +func (s server) ConfigureProvider(ctx context.Context, req *tfprotov5.ConfigureProviderRequest) (*tfprotov5.ConfigureProviderResponse, error) { + var diags []*tfprotov5.Diagnostic + return &tfprotov5.ConfigureProviderResponse{ + Diagnostics: diags, + }, nil +} + +func (s server) StopProvider(ctx context.Context, req *tfprotov5.StopProviderRequest) (*tfprotov5.StopProviderResponse, error) { + return &tfprotov5.StopProviderResponse{}, nil +} + +func (s server) getClient() *api.Client { + return s.provider.Meta().(nomad.ProviderConfig).Client +} + +func Server(provider *schema.Provider) func() tfprotov5.ProviderServer { + return func() tfprotov5.ProviderServer { + c, err := NewConverter(reflect.TypeOf(api.Job{})) + s := server{ + // We keep a reference to the other provider so that we can use the + // same client + provider: provider, + + // If we get an error now we store it in the server so that we can + // return it in GetProviderSchema() + err: err, + resourceSchemas: map[string]*tfprotov5.Schema{ + "nomad_job_v2": { + Version: 1, + Block: &tfprotov5.SchemaBlock{ + Version: 1, + Attributes: []*tfprotov5.SchemaAttribute{ + { + Name: "id", + Type: tftypes.String, + Computed: true, + }, + { + Name: "out", + Type: tftypes.DynamicPseudoType, + Computed: true, + }, + }, + BlockTypes: []*tfprotov5.SchemaNestedBlock{ + { + TypeName: "job", + Nesting: tfprotov5.SchemaNestedBlockNestingModeMap, + Block: c.Schema, + }, + }, + }, + }, + }, + resourceRouter: resourceRouter{}, + } + + s.resourceRouter["nomad_job_v2"] = nomadJob{ + s: &s, + converter: c, + } + + return s + } +} diff --git a/internal/protocolprovider/util.go b/internal/protocolprovider/util.go new file mode 100644 index 00000000..9a5fc036 --- /dev/null +++ b/internal/protocolprovider/util.go @@ -0,0 +1,83 @@ +package protocol + +// Some parts of this were copied from https://github.com/paultyng/terraform-provider-sql/blob/main/internal/server/util.go + +import ( + "fmt" + + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tftypes" +) + +// potential terraform-plugin-go convenience funcs +func unmarshalDynamicValueObject(dv *tfprotov5.DynamicValue, ty tftypes.Object) (tftypes.Value, map[string]tftypes.Value, error) { + obj, err := dv.Unmarshal(ty) + if err != nil { + return tftypes.Value{}, nil, fmt.Errorf("error dv.Unmarshal: %w", err) + } + + objMap := map[string]tftypes.Value{} + err = obj.As(&objMap) + if err != nil { + return tftypes.Value{}, nil, fmt.Errorf("error obj.As: %w", err) + } + + return obj, objMap, nil +} + +func schemaAsObject(schema *tfprotov5.Schema, markAttributesAsOptional bool) tftypes.Object { + return blockAsObject(schema.Block, markAttributesAsOptional) +} + +func blockAsObject(block *tfprotov5.SchemaBlock, markAttributesAsOptional bool) tftypes.Object { + o := tftypes.Object{ + AttributeTypes: map[string]tftypes.Type{}, + OptionalAttributes: map[string]struct{}{}, + } + + for _, b := range block.BlockTypes { + o.AttributeTypes[b.TypeName] = nestedBlockAsObject(b, markAttributesAsOptional) + if markAttributesAsOptional { + o.OptionalAttributes[b.TypeName] = struct{}{} + } + } + + for _, s := range block.Attributes { + o.AttributeTypes[s.Name] = s.Type + if markAttributesAsOptional { + o.OptionalAttributes[s.Name] = struct{}{} + } + } + + return o +} + +func nestedBlockAsObject(nestedBlock *tfprotov5.SchemaNestedBlock, markAttributesAsOptional bool) tftypes.Type { + switch nestedBlock.Nesting { + case tfprotov5.SchemaNestedBlockNestingModeSingle: + return blockAsObject(nestedBlock.Block, markAttributesAsOptional) + case tfprotov5.SchemaNestedBlockNestingModeList: + return tftypes.List{ + ElementType: blockAsObject(nestedBlock.Block, markAttributesAsOptional), + } + case tfprotov5.SchemaNestedBlockNestingModeMap: + return tftypes.Map{ + AttributeType: blockAsObject(nestedBlock.Block, markAttributesAsOptional), + } + } + + panic(fmt.Sprintf("nested type of %s for %s not supported", nestedBlock.Nesting, nestedBlock.TypeName)) +} + +func wrap(err error, summary string) []*tfprotov5.Diagnostic { + if err == nil { + return []*tfprotov5.Diagnostic{} + } + return []*tfprotov5.Diagnostic{ + { + Severity: tfprotov5.DiagnosticSeverityError, + Summary: summary, + Detail: err.Error(), + }, + } +} diff --git a/main.go b/main.go index 1755c7e0..ea627618 100644 --- a/main.go +++ b/main.go @@ -6,12 +6,15 @@ import ( "github.com/hashicorp/terraform-plugin-go/tfprotov5" tf5server "github.com/hashicorp/terraform-plugin-go/tfprotov5/server" tfmux "github.com/hashicorp/terraform-plugin-mux" + protocol "github.com/hashicorp/terraform-provider-nomad/internal/protocolprovider" "github.com/hashicorp/terraform-provider-nomad/nomad" ) func main() { ctx := context.Background() - muxed, err := tfmux.NewSchemaServerFactory(ctx, nomad.Provider().GRPCProvider) + + provider := nomad.Provider() + muxed, err := tfmux.NewSchemaServerFactory(ctx, provider.GRPCProvider, protocol.Server(provider)) if err != nil { panic(err) } diff --git a/nomad/data_source_acl_policies.go b/nomad/data_source_acl_policies.go index bd340e6e..310867e7 100644 --- a/nomad/data_source_acl_policies.go +++ b/nomad/data_source_acl_policies.go @@ -44,7 +44,7 @@ func dataSourceAclPolicies() *schema.Resource { func dataSourceAclPoliciesRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client queryOpts := &api.QueryOptions{} if v, ok := d.GetOk("prefix"); ok && v.(string) != "" { queryOpts.Prefix = v.(string) diff --git a/nomad/data_source_acl_policies_test.go b/nomad/data_source_acl_policies_test.go index fac3182a..6c78e9fe 100644 --- a/nomad/data_source_acl_policies_test.go +++ b/nomad/data_source_acl_policies_test.go @@ -51,7 +51,7 @@ data "nomad_acl_policies" "test" { func testAccCreateNomadAclPolicies(t *testing.T, n int) func() { return func() { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client for i := 0; i < n; i++ { rName := acctest.RandomWithPrefix("tf-acc-test") policy := api.ACLPolicy{ @@ -72,7 +72,7 @@ func testAccCreateNomadAclPolicies(t *testing.T, n int) func() { } func sweepACLPolicies() error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policies, _, err := client.ACLPolicies().List(&api.QueryOptions{}) if err != nil { return err diff --git a/nomad/data_source_acl_policy.go b/nomad/data_source_acl_policy.go index 190989fe..ecb6ac00 100644 --- a/nomad/data_source_acl_policy.go +++ b/nomad/data_source_acl_policy.go @@ -34,7 +34,7 @@ func dataSourceAclPolicy() *schema.Resource { func dataSourceAclPolicyRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client name := d.Get("name").(string) diff --git a/nomad/data_source_acl_policy_test.go b/nomad/data_source_acl_policy_test.go index d8bb8d6d..3885b503 100644 --- a/nomad/data_source_acl_policy_test.go +++ b/nomad/data_source_acl_policy_test.go @@ -63,7 +63,7 @@ func testAccDataSourceNomadAclPolicyExists(n string) resource.TestCheckFunc { } providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client name := rs.Primary.ID diff --git a/nomad/data_source_acl_token.go b/nomad/data_source_acl_token.go index 6bd2fbbd..776bf51e 100644 --- a/nomad/data_source_acl_token.go +++ b/nomad/data_source_acl_token.go @@ -61,7 +61,7 @@ func dataSourceACLToken() *schema.Resource { func dataSourceACLTokenRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client accessor := d.Get("accessor_id").(string) // retrieve the token diff --git a/nomad/data_source_acl_tokens.go b/nomad/data_source_acl_tokens.go index afda523b..871e7d7c 100644 --- a/nomad/data_source_acl_tokens.go +++ b/nomad/data_source_acl_tokens.go @@ -55,7 +55,7 @@ func dataSourceACLTokens() *schema.Resource { } func aclTokensDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client qOpts := &api.QueryOptions{ Prefix: d.Get("prefix").(string), diff --git a/nomad/data_source_datacenters.go b/nomad/data_source_datacenters.go index cea84e6e..a5bde152 100644 --- a/nomad/data_source_datacenters.go +++ b/nomad/data_source_datacenters.go @@ -39,7 +39,7 @@ func dataSourceDatacenters() *schema.Resource { } func dataSourceDatacentersRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client nodes, _, err := client.Nodes().List(nil) if err != nil { return fmt.Errorf("failed to query list of nodes: %v", err) diff --git a/nomad/data_source_deployments.go b/nomad/data_source_deployments.go index a9aab196..21ead731 100644 --- a/nomad/data_source_deployments.go +++ b/nomad/data_source_deployments.go @@ -26,7 +26,7 @@ func dataSourceDeployments() *schema.Resource { func dataSourceDeploymentsRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client log.Printf("[DEBUG] Getting deployments...") deployment_list, _, err := client.Deployments().List(nil) diff --git a/nomad/data_source_job_parser.go b/nomad/data_source_job_parser.go index 61883b3e..98569cc9 100644 --- a/nomad/data_source_job_parser.go +++ b/nomad/data_source_job_parser.go @@ -35,7 +35,7 @@ func dataSourceJobParser() *schema.Resource { func dataSourceJobParserRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client hcl := d.Get("hcl").(string) canonicalize := d.Get("canonicalize").(bool) diff --git a/nomad/data_source_namespace.go b/nomad/data_source_namespace.go index 4f82bc5b..626f7d4e 100644 --- a/nomad/data_source_namespace.go +++ b/nomad/data_source_namespace.go @@ -28,7 +28,7 @@ func dataSourceNamespace() *schema.Resource { } func namespaceDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Get("name").(string) ns, _, err := client.Namespaces().Info(name, nil) diff --git a/nomad/data_source_namespaces.go b/nomad/data_source_namespaces.go index dddfd426..cd7d8df5 100644 --- a/nomad/data_source_namespaces.go +++ b/nomad/data_source_namespaces.go @@ -22,7 +22,7 @@ func dataSourceNamespaces() *schema.Resource { } func namespacesDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client log.Printf("[DEBUG] Reading namespaces from Nomad") resp, _, err := client.Namespaces().List(nil) diff --git a/nomad/data_source_plugins.go b/nomad/data_source_plugins.go index d0f2bd17..b43c3dae 100644 --- a/nomad/data_source_plugins.go +++ b/nomad/data_source_plugins.go @@ -36,7 +36,7 @@ func dataSourcePlugins() *schema.Resource { } func pluginsDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client log.Printf("[DEBUG] Reading list of dynamic plugins from Nomad") resp, _, err := client.CSIPlugins().List(nil) diff --git a/nomad/data_source_regions.go b/nomad/data_source_regions.go index a24d6645..bc2d01b5 100644 --- a/nomad/data_source_regions.go +++ b/nomad/data_source_regions.go @@ -22,7 +22,7 @@ func dataSourceRegions() *schema.Resource { } func regionsDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client log.Printf("[DEBUG] Reading regions from Nomad") resp, err := client.Regions().List() diff --git a/nomad/data_source_scaling_policies.go b/nomad/data_source_scaling_policies.go index 1c7d3afc..bbfb2147 100644 --- a/nomad/data_source_scaling_policies.go +++ b/nomad/data_source_scaling_policies.go @@ -57,7 +57,7 @@ func dataSourceScalingPolicies() *schema.Resource { } func scalingPoliciesDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client jobID := d.Get("job_id").(string) typeQuery := d.Get("type").(string) diff --git a/nomad/data_source_scaling_policy.go b/nomad/data_source_scaling_policy.go index 92cc7db6..e0e936bf 100644 --- a/nomad/data_source_scaling_policy.go +++ b/nomad/data_source_scaling_policy.go @@ -54,7 +54,7 @@ func dataSourceScalingPolicy() *schema.Resource { } func scalingPolicyDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client id := d.Get("id").(string) p, _, err := client.Scaling().GetPolicy(id, nil) diff --git a/nomad/data_source_scheduler_config.go b/nomad/data_source_scheduler_config.go index d895bfcd..56c2b7b8 100644 --- a/nomad/data_source_scheduler_config.go +++ b/nomad/data_source_scheduler_config.go @@ -35,7 +35,7 @@ func dataSourceSchedulerConfig() *schema.Resource { func dataSourceSchedulerConfigRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client schedCfg, _, err := client.Operator().SchedulerGetConfiguration(nil) if err != nil { diff --git a/nomad/data_source_volumes.go b/nomad/data_source_volumes.go index 60d46ba8..3ab1e350 100644 --- a/nomad/data_source_volumes.go +++ b/nomad/data_source_volumes.go @@ -55,7 +55,7 @@ func dataSourceVolumes() *schema.Resource { } func volumesDataSourceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client ns := d.Get("namespace").(string) if ns == "" { diff --git a/nomad/datasource_nomad_job.go b/nomad/datasource_nomad_job.go index efcfbee0..56d2a821 100644 --- a/nomad/datasource_nomad_job.go +++ b/nomad/datasource_nomad_job.go @@ -164,7 +164,7 @@ func dataSourceJob() *schema.Resource { func dataSourceJobRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client id := d.Get("job_id").(string) ns := d.Get("namespace").(string) diff --git a/nomad/datasource_nomad_job_test.go b/nomad/datasource_nomad_job_test.go index 2ab06bf0..e6cca000 100644 --- a/nomad/datasource_nomad_job_test.go +++ b/nomad/datasource_nomad_job_test.go @@ -100,7 +100,7 @@ func testAccDataSourceNomadJobExists(n, namespace string) resource.TestCheckFunc } providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client id := rs.Primary.ID diff --git a/nomad/datasource_nomad_plugin.go b/nomad/datasource_nomad_plugin.go index cbe25ed2..4e638081 100644 --- a/nomad/datasource_nomad_plugin.go +++ b/nomad/datasource_nomad_plugin.go @@ -91,7 +91,7 @@ func dataSourcePlugin() *schema.Resource { func dataSourcePluginRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client wait := d.Get("wait_for_registration").(bool) waitForHealthy := d.Get("wait_for_healthy").(bool) diff --git a/nomad/provider.go b/nomad/provider.go index e39f0e74..08d65bc9 100644 --- a/nomad/provider.go +++ b/nomad/provider.go @@ -11,7 +11,7 @@ import ( ) type ProviderConfig struct { - client *api.Client + Client *api.Client vaultToken *string consulToken *string config *api.Config @@ -228,7 +228,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { res := ProviderConfig{ config: conf, - client: client, + Client: client, vaultToken: &vaultToken, consulToken: &consulToken, } diff --git a/nomad/provider_test.go b/nomad/provider_test.go index 57c42b77..fe935fc3 100644 --- a/nomad/provider_test.go +++ b/nomad/provider_test.go @@ -66,7 +66,7 @@ func testAccPreCheck(t *testing.T) { func testEntFeatures(t *testing.T, requiredFeatures ...string) { testCheckEnt(t) - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client resp, _, err := client.Operator().LicenseGet(nil) if err != nil { t.Fatal(err) @@ -89,7 +89,7 @@ func testCheckEnt(t *testing.T) { } func testCheckVersion(t *testing.T, versionCheck func(version.Version) bool) { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client if nodes, _, err := client.Nodes().List(nil); err == nil && len(nodes) > 0 { if version, err := version.NewVersion(nodes[0].Version); err != nil { t.Skip("could not parse node version: ", err) @@ -114,7 +114,7 @@ func testCheckMinVersion(t *testing.T, v string) { } func testCheckVaultEnabled(t *testing.T) { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client vaultEnabled := false if nodes, _, err := client.Nodes().List(nil); err == nil && len(nodes) > 0 { if node, _, err := client.Nodes().Info(nodes[0].ID, nil); err == nil { @@ -171,7 +171,7 @@ func testAccCheckNomadProviderConfigWithHeaders(provider *schema.Provider) resou func testAccCheckNomadProviderConfigWithHeadersCrashCheckDestroy(provider *schema.Provider) resource.TestCheckFunc { return func(_ *terraform.State) error { providerConfig := provider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client namespaces, _, err := client.Namespaces().List(nil) if err != nil { return err diff --git a/nomad/resource_acl_policy.go b/nomad/resource_acl_policy.go index da2930a8..c386d0cf 100644 --- a/nomad/resource_acl_policy.go +++ b/nomad/resource_acl_policy.go @@ -46,7 +46,7 @@ func resourceACLPolicy() *schema.Resource { func resourceACLPolicyCreate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client policy := api.ACLPolicy{ Name: d.Get("name").(string), @@ -68,7 +68,7 @@ func resourceACLPolicyCreate(d *schema.ResourceData, meta interface{}) error { func resourceACLPolicyUpdate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client policy := api.ACLPolicy{ Name: d.Get("name").(string), @@ -89,7 +89,7 @@ func resourceACLPolicyUpdate(d *schema.ResourceData, meta interface{}) error { func resourceACLPolicyDelete(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client name := d.Id() // delete the policy @@ -105,7 +105,7 @@ func resourceACLPolicyDelete(d *schema.ResourceData, meta interface{}) error { func resourceACLPolicyRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client name := d.Id() // retrieve the policy @@ -126,7 +126,7 @@ func resourceACLPolicyRead(d *schema.ResourceData, meta interface{}) error { func resourceACLPolicyExists(d *schema.ResourceData, meta interface{}) (bool, error) { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client name := d.Id() log.Printf("[DEBUG] Checking if ACL policy %q exists", name) diff --git a/nomad/resource_acl_policy_test.go b/nomad/resource_acl_policy_test.go index b54e6fe2..c2d41054 100644 --- a/nomad/resource_acl_policy_test.go +++ b/nomad/resource_acl_policy_test.go @@ -159,7 +159,7 @@ func testResourceACLPolicy_initialCheck(name string) resource.TestCheckFunc { return fmt.Errorf("expected rules_hcl to be %q, is %q in state", rules_hcl, instanceState.Attributes["rules_hcl"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil { return fmt.Errorf("error reading back policy %q: %s", name, err) @@ -181,7 +181,7 @@ func testResourceACLPolicy_initialCheck(name string) resource.TestCheckFunc { func testResourceACLPolicy_checkExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil { return fmt.Errorf("error reading back policy: %s", err) @@ -196,7 +196,7 @@ func testResourceACLPolicy_checkExists(name string) resource.TestCheckFunc { func testResourceACLPolicy_checkDestroy(name string) resource.TestCheckFunc { return func(*terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil && strings.Contains(err.Error(), "404") || policy == nil { return nil @@ -207,7 +207,7 @@ func testResourceACLPolicy_checkDestroy(name string) resource.TestCheckFunc { func testResourceACLPolicy_delete(t *testing.T, name string) func() { return func() { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client _, err := client.ACLPolicies().Delete(name, nil) if err != nil { t.Fatalf("error deleting ACL policy: %s", err) @@ -266,7 +266,7 @@ func testResourceACLPolicy_updateCheck(name string) resource.TestCheckFunc { return fmt.Errorf("expected rules_hcl to be %q, is %q in state", rules_hcl, instanceState.Attributes["rules_hcl"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil { return fmt.Errorf("error reading back policy %q: %s", name, err) diff --git a/nomad/resource_acl_token.go b/nomad/resource_acl_token.go index f446f15e..943be0fa 100644 --- a/nomad/resource_acl_token.go +++ b/nomad/resource_acl_token.go @@ -73,7 +73,7 @@ func resourceACLToken() *schema.Resource { func resourceACLTokenCreate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client policies := make([]string, 0, len(d.Get("policies").(*schema.Set).List())) for _, pol := range d.Get("policies").(*schema.Set).List() { @@ -109,7 +109,7 @@ func resourceACLTokenCreate(d *schema.ResourceData, meta interface{}) error { func resourceACLTokenUpdate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client policies := make([]string, 0, len(d.Get("policies").(*schema.Set).List())) for _, pol := range d.Get("policies").(*schema.Set).List() { @@ -136,7 +136,7 @@ func resourceACLTokenUpdate(d *schema.ResourceData, meta interface{}) error { func resourceACLTokenDelete(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client accessor := d.Id() // delete the token @@ -152,7 +152,7 @@ func resourceACLTokenDelete(d *schema.ResourceData, meta interface{}) error { func resourceACLTokenRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client accessor := d.Id() // retrieve the token @@ -177,7 +177,7 @@ func resourceACLTokenRead(d *schema.ResourceData, meta interface{}) error { func resourceACLTokenExists(d *schema.ResourceData, meta interface{}) (bool, error) { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client accessor := d.Id() log.Printf("[DEBUG] Checking if ACL token %q exists", accessor) diff --git a/nomad/resource_acl_token_test.go b/nomad/resource_acl_token_test.go index bc29b246..db216585 100644 --- a/nomad/resource_acl_token_test.go +++ b/nomad/resource_acl_token_test.go @@ -121,7 +121,7 @@ func testResourceACLToken_initialCheck() resource.TestCheckFunc { return fmt.Errorf("expected policies.# to be %q, is %q in state", policies, instanceState.Attributes["policies.#"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client token, _, err := client.ACLTokens().Info(instanceState.ID, nil) if err != nil { return fmt.Errorf("error reading back token %q: %s", instanceState.ID, err) @@ -152,7 +152,7 @@ func testResourceACLToken_checkDestroy(s *terraform.State) error { if s.Primary == nil { continue } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client token, _, err := client.ACLTokens().Info(s.Primary.ID, nil) if err != nil && strings.Contains(err.Error(), "404") || token == nil { continue @@ -216,7 +216,7 @@ func testResourceACLToken_updateCheck() resource.TestCheckFunc { return fmt.Errorf("expected policies.# to be %q, is %q in state", policies, instanceState.Attributes["policies.#"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client token, _, err := client.ACLTokens().Info(instanceState.ID, nil) if err != nil { return fmt.Errorf("error reading back token %q: %s", instanceState.ID, err) diff --git a/nomad/resource_external_volume.go b/nomad/resource_external_volume.go index 3999b126..9fb35ce2 100644 --- a/nomad/resource_external_volume.go +++ b/nomad/resource_external_volume.go @@ -235,7 +235,7 @@ func resourceExternalVolume() *schema.Resource { func resourceExternalVolumeCreate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // Parse capacities from human-friendly string to number. capacityMin, err := humanize.ParseBytes(d.Get("capacity_min").(string)) @@ -310,7 +310,7 @@ func resourceExternalVolumeCreate(d *schema.ResourceData, meta interface{}) erro func resourceExternalVolumeDelete(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client id := d.Id() log.Printf("[DEBUG] deleting volume: %q", id) diff --git a/nomad/resource_job.go b/nomad/resource_job.go index 120d9cbc..d76b40cf 100644 --- a/nomad/resource_job.go +++ b/nomad/resource_job.go @@ -309,7 +309,7 @@ func resourceJobRegister(d *schema.ResourceData, meta interface{}) error { } providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // Get the jobspec itself. jobspecRaw := d.Get("jobspec").(string) @@ -480,7 +480,7 @@ func deploymentStateRefreshFunc(client *api.Client, deploymentID string) resourc func resourceJobDeregister(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // If deregistration is disabled, then do nothing deregister_on_destroy := d.Get("deregister_on_destroy").(bool) @@ -510,7 +510,7 @@ func resourceJobDeregister(d *schema.ResourceData, meta interface{}) error { func resourceJobRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client id := d.Id() opts := &api.QueryOptions{ @@ -562,7 +562,7 @@ func resourceJobRead(d *schema.ResourceData, meta interface{}) error { func resourceJobCustomizeDiff(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { log.Printf("[DEBUG] resourceJobCustomizeDiff") providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client if !d.NewValueKnown("jobspec") { d.SetNewComputed("name") diff --git a/nomad/resource_job_test.go b/nomad/resource_job_test.go index 59aa66a3..4d6a01c0 100644 --- a/nomad/resource_job_test.go +++ b/nomad/resource_job_test.go @@ -399,7 +399,7 @@ func TestResourceJob_disableDestroyDeregister(t *testing.T) { Config: testResourceJob_noDestroy, Check: func(*terraform.State) error { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info("foo-nodestroy", nil) if err != nil { return err @@ -507,7 +507,7 @@ func TestResourceJob_purgeOnDestroy(t *testing.T) { Config: testResourceJob_purgeOnDestroy, Check: func(s *terraform.State) error { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info("purge-test", nil) if !assert.EqualError(t, err, "Unexpected response code: 404 (job not found)") { return fmt.Errorf("Job found: %#v", job) @@ -534,7 +534,7 @@ func testResourceJob_parameterizedCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { return fmt.Errorf("error reading back job: %s", err) @@ -583,7 +583,7 @@ func testResourceJob_hcl2Check(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { return fmt.Errorf("error reading back job: %s", err) @@ -1164,7 +1164,7 @@ func testResourceJob_initialCheckNS(t *testing.T, expectedNamespace string) r.Te } providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, &api.QueryOptions{ Namespace: expectedNamespace, }) @@ -1217,7 +1217,7 @@ func testResourceJob_v086Check(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { return fmt.Errorf("error reading back job: %s", err) @@ -1305,7 +1305,7 @@ func testResourceJob_v090Check(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { return fmt.Errorf("error reading back job: %s", err) @@ -1379,7 +1379,7 @@ func testResourceJob_volumesCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1456,7 +1456,7 @@ func testResourceJob_scalingPolicyCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1522,7 +1522,7 @@ func testResourceJob_scalingPolicyDASCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1615,7 +1615,7 @@ func testResourceJob_serviceDeploymentInfoCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client deployment, _, err := client.Jobs().LatestDeployment(jobID, nil) if err != nil { @@ -1649,7 +1649,7 @@ func testResourceJob_lifecycleCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1713,7 +1713,7 @@ func testResourceJob_csiControllerCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1769,7 +1769,7 @@ func testResourceJob_consulConnectCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1851,7 +1851,7 @@ func testResourceJob_consulConnectIngressGatewayCheck(s *terraform.State) error jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -1937,7 +1937,7 @@ func testResourceJob_consulConnectTerminatingGatewayCheck(s *terraform.State) er jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -2013,7 +2013,7 @@ func testResourceJob_consulNamespaceCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // Find alloc for out test job. allocs, _, err := client.Allocations().List(nil) @@ -2099,7 +2099,7 @@ func testResourceJob_cpuCoresCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -2142,7 +2142,7 @@ func testResourceJob_multiregionCheck(s *terraform.State) error { jobID := instanceState.ID providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client job, _, err := client.Jobs().Info(jobID, nil) if err != nil { @@ -2164,7 +2164,7 @@ func testResourceJob_multiregionCheck(s *terraform.State) error { func testResourceJob_checkExistsNS(jobID, ns string) r.TestCheckFunc { return func(*terraform.State) error { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client _, _, err := client.Jobs().Info(jobID, &api.QueryOptions{ Namespace: ns, }) @@ -2187,7 +2187,7 @@ func testResourceJob_checkDestroy(jobID string) r.TestCheckFunc { func testResourceJob_checkDestroyNS(jobID, ns string) r.TestCheckFunc { return func(*terraform.State) error { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client tries := 0 TRY: @@ -2218,7 +2218,7 @@ func testResourceJob_checkDestroyNS(jobID, ns string) r.TestCheckFunc { func testResourceJob_forceDestroyWithPurge(jobID, namespace string) r.TestCheckFunc { return func(*terraform.State) error { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client _, _, err := client.Jobs().Deregister(jobID, true, &api.WriteOptions{ Namespace: namespace, }) @@ -2232,7 +2232,7 @@ func testResourceJob_forceDestroyWithPurge(jobID, namespace string) r.TestCheckF func testResourceJob_deregister(t *testing.T, jobID string) func() { return func() { providerConfig := testProvider.Meta().(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client _, _, err := client.Jobs().Deregister(jobID, false, nil) if err != nil { t.Fatalf("error deregistering job: %s", err) diff --git a/nomad/resource_namespace.go b/nomad/resource_namespace.go index 61037170..2cdf682c 100644 --- a/nomad/resource_namespace.go +++ b/nomad/resource_namespace.go @@ -46,7 +46,7 @@ func resourceNamespace() *schema.Resource { } func resourceNamespaceWrite(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client namespace := api.Namespace{ Name: d.Get("name").(string), @@ -66,7 +66,7 @@ func resourceNamespaceWrite(d *schema.ResourceData, meta interface{}) error { } func resourceNamespaceDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Deleting namespace %q", name) @@ -107,7 +107,7 @@ func resourceNamespaceDelete(d *schema.ResourceData, meta interface{}) error { } func resourceNamespaceRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Reading namespace %q", name) @@ -126,7 +126,7 @@ func resourceNamespaceRead(d *schema.ResourceData, meta interface{}) error { } func resourceNamespaceExists(d *schema.ResourceData, meta interface{}) (bool, error) { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Checking if namespace %q exists", name) diff --git a/nomad/resource_namespace_test.go b/nomad/resource_namespace_test.go index 3422efe6..d4451bfe 100644 --- a/nomad/resource_namespace_test.go +++ b/nomad/resource_namespace_test.go @@ -161,7 +161,7 @@ func testResourceNamespace_initialCheck(name string) resource.TestCheckFunc { return fmt.Errorf("expected description to be %q, is %q in state", description, instanceState.Attributes["description"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client namespace, _, err := client.Namespaces().Info(name, nil) if err != nil { return fmt.Errorf("error reading back namespace %q: %s", name, err) @@ -180,7 +180,7 @@ func testResourceNamespace_initialCheck(name string) resource.TestCheckFunc { func testResourceNamespace_checkExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client namespace, _, err := client.Namespaces().Info(name, nil) if err != nil { return fmt.Errorf("error reading back namespace %q: %s", name, err) @@ -195,7 +195,7 @@ func testResourceNamespace_checkExists(name string) resource.TestCheckFunc { func testResourceNamespace_checkDestroy(name string) resource.TestCheckFunc { return func(*terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client namespace, _, err := client.Namespaces().Info(name, nil) if err != nil && strings.Contains(err.Error(), "404") || namespace == nil { return nil @@ -211,7 +211,7 @@ func testResourceNamespace_checkResetDefault() resource.TestCheckFunc { Description: "Default shared namespace", Quota: "", } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client namespace, _, err := client.Namespaces().Info(defaultNamespace.Name, nil) if err != nil { return fmt.Errorf("failed to find default namespace %q.", defaultNamespace.Name) @@ -226,7 +226,7 @@ func testResourceNamespace_checkResetDefault() resource.TestCheckFunc { func testResourceNamespace_delete(t *testing.T, name string) func() { return func() { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client _, err := client.Namespaces().Delete(name, nil) if err != nil { t.Fatalf("error deleting namespace %q: %s", name, err) @@ -270,7 +270,7 @@ func testResourceNamespace_updateCheck(name string) resource.TestCheckFunc { return fmt.Errorf("expected description to be %q, is %q in state", description, instanceState.Attributes["description"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client namespace, _, err := client.Namespaces().Info(name, nil) if err != nil { return fmt.Errorf("error reading back namespace %q: %s", name, err) diff --git a/nomad/resource_quota_specification.go b/nomad/resource_quota_specification.go index 86275ece..47a3f2fa 100644 --- a/nomad/resource_quota_specification.go +++ b/nomad/resource_quota_specification.go @@ -80,7 +80,7 @@ func resourceQuotaSpecificationRegionLimits() *schema.Resource { } func resourceQuotaSpecificationWrite(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client spec := api.QuotaSpec{ Name: d.Get("name").(string), @@ -104,7 +104,7 @@ func resourceQuotaSpecificationWrite(d *schema.ResourceData, meta interface{}) e } func resourceQuotaSpecificationDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() // delete the quota spec @@ -119,7 +119,7 @@ func resourceQuotaSpecificationDelete(d *schema.ResourceData, meta interface{}) } func resourceQuotaSpecificationRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() // retrieve the policy @@ -142,7 +142,7 @@ func resourceQuotaSpecificationRead(d *schema.ResourceData, meta interface{}) er } func resourceQuotaSpecificationExists(d *schema.ResourceData, meta interface{}) (bool, error) { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Checking if quota specification %q exists", name) diff --git a/nomad/resource_quota_specification_test.go b/nomad/resource_quota_specification_test.go index 3f84300b..3ad4d531 100644 --- a/nomad/resource_quota_specification_test.go +++ b/nomad/resource_quota_specification_test.go @@ -190,7 +190,7 @@ func testResourceQuotaSpecification_initialCheck(name string) resource.TestCheck instanceState.Attributes["limits."+key+".region_limit."+regKey+".cpu"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client spec, _, err := client.Quotas().Info(name, nil) if err != nil { return fmt.Errorf("error reading back quota specification %q: %s", name, err) @@ -219,7 +219,7 @@ func testResourceQuotaSpecification_initialCheck(name string) resource.TestCheck func testResourceQuotaSpecification_checkExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client spec, _, err := client.Quotas().Info(name, nil) if err != nil { return fmt.Errorf("error reading back quota specification %q: %s", name, err) @@ -234,7 +234,7 @@ func testResourceQuotaSpecification_checkExists(name string) resource.TestCheckF func testResourceQuotaSpecification_checkDestroy(name string) resource.TestCheckFunc { return func(*terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client spec, _, err := client.Quotas().Info(name, nil) if err != nil && strings.Contains(err.Error(), "404") || spec == nil { return nil @@ -247,7 +247,7 @@ func testResourceQuotaSpecification_checkDestroy(name string) resource.TestCheck func testResourceQuotaSpecification_delete(t *testing.T, name string) func() { return func() { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client _, err := client.Quotas().Delete(name, nil) if err != nil { t.Fatalf("error deleting quota specification %q: %s", name, err) @@ -344,7 +344,7 @@ func testResourceQuotaSpecification_updateCheck(name string) resource.TestCheckF instanceState.Attributes["limits."+key+".region_limit."+regKey+".memory_mb"]) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client spec, _, err := client.Quotas().Info(name, nil) if err != nil { return fmt.Errorf("error reading back quota specification %q: %s", name, err) diff --git a/nomad/resource_scheduler_config.go b/nomad/resource_scheduler_config.go index 63d3efcc..816d4367 100644 --- a/nomad/resource_scheduler_config.go +++ b/nomad/resource_scheduler_config.go @@ -54,7 +54,7 @@ func resourceSchedulerConfig() *schema.Resource { } func resourceSchedulerConfigurationCreate(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client operator := client.Operator() config := api.SchedulerConfiguration{ @@ -109,7 +109,7 @@ func resourceSchedulerConfigurationCreate(d *schema.ResourceData, meta interface func resourceSchedulerConfigurationDelete(_ *schema.ResourceData, _ interface{}) error { return nil } func resourceSchedulerConfigurationRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client operator := client.Operator() // The scheduler config doesn't have a UUID, so the resource uses the agent diff --git a/nomad/resource_sentinel_policy.go b/nomad/resource_sentinel_policy.go index 211a6511..f3bc7089 100644 --- a/nomad/resource_sentinel_policy.go +++ b/nomad/resource_sentinel_policy.go @@ -68,7 +68,7 @@ func resourceSentinelPolicy() *schema.Resource { } func resourceSentinelPolicyWrite(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client policy := api.SentinelPolicy{ Name: d.Get("name").(string), @@ -90,7 +90,7 @@ func resourceSentinelPolicyWrite(d *schema.ResourceData, meta interface{}) error } func resourceSentinelPolicyDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Deleting Sentinel policy %q", name) @@ -104,7 +104,7 @@ func resourceSentinelPolicyDelete(d *schema.ResourceData, meta interface{}) erro } func resourceSentinelPolicyRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Reading Sentinel policy %q", name) @@ -125,7 +125,7 @@ func resourceSentinelPolicyRead(d *schema.ResourceData, meta interface{}) error } func resourceSentinelPolicyExists(d *schema.ResourceData, meta interface{}) (bool, error) { - client := meta.(ProviderConfig).client + client := meta.(ProviderConfig).Client name := d.Id() log.Printf("[DEBUG] Checking if Sentinel policy %q exists", name) diff --git a/nomad/resource_sentinel_policy_test.go b/nomad/resource_sentinel_policy_test.go index c4ccfb13..3508c6cf 100644 --- a/nomad/resource_sentinel_policy_test.go +++ b/nomad/resource_sentinel_policy_test.go @@ -163,7 +163,7 @@ func testResourceSentinelPolicy_checkAttrs(name, description, sentinelPolicy, sc return fmt.Errorf("expected policy to be %q, is %q in state", sentinelPolicy, strings.TrimSpace(instanceState.Attributes["policy"])) } - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.SentinelPolicies().Info(name, nil) if err != nil { return fmt.Errorf("error reading back policy %q: %s", name, err) @@ -191,7 +191,7 @@ func testResourceSentinelPolicy_checkAttrs(name, description, sentinelPolicy, sc func testResourceSentinelPolicy_checkExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil { return fmt.Errorf("error reading back policy: %s", err) @@ -206,7 +206,7 @@ func testResourceSentinelPolicy_checkExists(name string) resource.TestCheckFunc func testResourceSentinelPolicy_checkDestroy(name string) resource.TestCheckFunc { return func(*terraform.State) error { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client policy, _, err := client.ACLPolicies().Info(name, nil) if err != nil && strings.Contains(err.Error(), "404") || policy == nil { return nil @@ -217,7 +217,7 @@ func testResourceSentinelPolicy_checkDestroy(name string) resource.TestCheckFunc func testResourceSentinelPolicy_delete(t *testing.T, name string) func() { return func() { - client := testProvider.Meta().(ProviderConfig).client + client := testProvider.Meta().(ProviderConfig).Client _, err := client.ACLPolicies().Delete(name, nil) if err != nil { t.Fatalf("error deleting ACL policy: %s", err) diff --git a/nomad/resource_volume.go b/nomad/resource_volume.go index 5702e8ec..3a0f8e06 100644 --- a/nomad/resource_volume.go +++ b/nomad/resource_volume.go @@ -286,7 +286,7 @@ func toMapStringString(m interface{}) map[string]string { func resourceVolumeCreate(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // Read capabilities maintaining backwards compatibility with the previous // fields attachment_mode and access_mode. @@ -374,7 +374,7 @@ func resourceVolumeCreate(d *schema.ResourceData, meta interface{}) error { func resourceVolumeDelete(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client // If deregistration is disabled, then do nothing deregister_on_destroy := d.Get("deregister_on_destroy").(bool) @@ -403,7 +403,7 @@ func resourceVolumeDelete(d *schema.ResourceData, meta interface{}) error { func resourceVolumeRead(d *schema.ResourceData, meta interface{}) error { providerConfig := meta.(ProviderConfig) - client := providerConfig.client + client := providerConfig.Client id := d.Id() opts := &api.QueryOptions{ From 27953446bdbc18456948a0fe11c116f06ac84733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lapeyre?= Date: Wed, 16 Jun 2021 13:11:55 +0200 Subject: [PATCH 4/4] Document nomad_job_v2 --- website/docs/r/job_v2.html.markdown | 74 +++++++++++++++++++++++++++++ website/nomad.erb | 3 ++ 2 files changed, 77 insertions(+) create mode 100644 website/docs/r/job_v2.html.markdown diff --git a/website/docs/r/job_v2.html.markdown b/website/docs/r/job_v2.html.markdown new file mode 100644 index 00000000..4aa3706f --- /dev/null +++ b/website/docs/r/job_v2.html.markdown @@ -0,0 +1,74 @@ +--- +layout: "nomad" +page_title: "Nomad: nomad_job_v2" +sidebar_current: "docs-nomad-resource-job-v2" +description: |- + Manages the lifecycle of registering and deregistering Nomad jobs + (applications). +--- + +# nomad_job_v2 + +Manages a job registered in Nomad. + +This can be used to initialize your cluster with system jobs, common services, +and more. In day to day Nomad use it is common for developers to submit jobs to +Nomad directly, such as for general app deployment. In addition to these apps, a +Nomad cluster often runs core system services that are ideally setup during +infrastructure creation. This resource is ideal for the latter type of job, but +can be used to manage any job within Nomad. + +## Example Usage + +Registering a job from a jobspec file: + +```hcl +resource "nomad_job_v2" "app" { + job "foo" { + datacenters = ["dc1"] + type = "service" + + group "foo" { + task "foo" { + driver = "raw_exec" + + # The config stanza must be specified as a string as it cannot be + # represented as a Terraform value + config = jsonencode({ + command = "/bin/sleep" + args = ["1"] + }) + + resources { + cpu = 20 + memory = 10 + } + + logs { + max_files = 3 + max_file_size = 10 + } + } + } + } +} + +output "spec" { + value = nomad_job_v2.app.out +} +``` + +## Argument Reference + +The following arguments are supported: + +- `job` `(string: )` - The specification of the job to register. + + +## Import + +The `nomad_job_v2` resource can be imported: + +```sh +$ terraform import nomad_job_v2.app foo +``` diff --git a/website/nomad.erb b/website/nomad.erb index 99a6070e..4f7b875b 100644 --- a/website/nomad.erb +++ b/website/nomad.erb @@ -83,6 +83,9 @@ > nomad_job + > + nomad_job + > nomad_namespace