Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

terraform-providers.datadog: 2.7.0 -> 3.2.0 #104310

Merged

Conversation

rguevara84
Copy link
Contributor

@rguevara84 rguevara84 commented Nov 19, 2020

Motivation for this change

Update Datadog provider since it is several versions behind, make the provider to be updated through the ./update-provider script by adding the owner and provider-source-address

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kalbasit
Copy link
Member

@GrahamcOfBorg build terraform.full

@kalbasit kalbasit self-assigned this Nov 19, 2020
@kalbasit
Copy link
Member

I think that this will have to wait for #103822 in order to get support for Go modules in our Terraform plugin infrastructure.

@kalbasit kalbasit marked this pull request as draft November 20, 2020 00:16
"sha256": "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd",
"version": "2.7.0"
"rev": "v2.16.0",
"sha256": "059bixrf2jx7wn6sb3xiszrh3yl5wx6i07wzmb0x7bk8vg45x4yp",
Copy link
Contributor

Choose a reason for hiding this comment

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

@rguevara84 could you rebase onto master and add

Suggested change
"sha256": "059bixrf2jx7wn6sb3xiszrh3yl5wx6i07wzmb0x7bk8vg45x4yp",
"sha256": "059bixrf2jx7wn6sb3xiszrh3yl5wx6i07wzmb0x7bk8vg45x4yp",
"vendorSha256": null,

This will allow it to build with Go module.

@stale
Copy link

stale bot commented Jun 2, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 2, 2021
@flokli flokli force-pushed the terraform-provider-datadog-v2.7.0-v2.16.0 branch from f5cf282 to 24e6ce0 Compare August 5, 2021 09:44
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 5, 2021
@flokli flokli changed the title terraform-providers-datadog: v2.7.0 -> v2.16.0 terraform-providers.datadog: 2.7.0 -> 3.2.0 Aug 5, 2021
@flokli
Copy link
Contributor

flokli commented Aug 5, 2021

I rebased this on nixpkgs master, squashed and reworded the commits to match CONTRIBUTING.md, and bumped the package to the latest release, 3.2.0.

It seems their vendor/ folder is somewhat wrong, I get the following with vendorSha256 set to null:

❯ nix-build -A terraform-providers.datadog
these derivations will be built:
  /nix/store/gcz7hrfsp1q9dfzxs0q1nri0s5a3726x-terraform-provider-datadog-3.2.0.drv
building '/nix/store/gcz7hrfsp1q9dfzxs0q1nri0s5a3726x-terraform-provider-datadog-3.2.0.drv'...
unpacking sources
unpacking source archive /nix/store/xbnn1i71bfqnbpvlfwvn1fiwd71ygj5g-source
source root is source
patching sources
configuring
building
Building subPackage ./.
go: inconsistent vendoring in /build/source:
        github.com/DataDog/datadog-api-client-go@v1.2.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/DataDog/datadog-go@v3.6.0+incompatible: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/cenkalti/backoff@v2.2.1+incompatible: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/dnaeon/go-vcr@v1.0.1: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/fatih/color@v1.9.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/google/uuid@v1.2.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/go-cleanhttp@v0.5.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/go-cty@v1.4.1-0.20200414143053-d3edf31b6320: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/go-uuid@v1.0.2: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/terraform-plugin-docs@v0.4.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/terraform-plugin-sdk/v2@v2.7.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/jonboulle/clockwork@v0.1.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/opentracing/opentracing-go@v1.2.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/philhofer/fwd@v1.0.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/zorkian/go-datadog-api@v2.30.0+incompatible: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        golang.org/x/net@v0.0.0-20210405180319-a5a99cb37ef4: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        golang.org/x/sys@v0.0.0-20210510120138-977fb7262007: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        golang.org/x/time@v0.0.0-20200416051211-89c76fbcd5d1: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        gopkg.in/DataDog/dd-trace-go.v1@v1.30.0-rc.1.0.20210420124628-f63633f38e8f: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
        github.com/hashicorp/terraform-plugin-docs@v0.4.0: is replaced in go.mod, but not marked as replaced in vendor/modules.txt
        gopkg.in/DataDog/dd-trace-go.v1: is replaced in go.mod, but not marked as replaced in vendor/modules.txt

        To ignore the vendor directory, use -mod=readonly or -mod=mod.
        To sync the vendor directory, run:
                go mod vendor
builder for '/nix/store/gcz7hrfsp1q9dfzxs0q1nri0s5a3726x-terraform-provider-datadog-3.2.0.drv' failed with exit code 1
error: build of '/nix/store/gcz7hrfsp1q9dfzxs0q1nri0s5a3726x-terraform-provider-datadog-3.2.0.drv' failed

So I also added the vendorSha256, and got it to compile :-)

@flokli flokli force-pushed the terraform-provider-datadog-v2.7.0-v2.16.0 branch from 24e6ce0 to 3356b5e Compare August 5, 2021 09:49
@flokli flokli marked this pull request as ready for review August 5, 2021 09:49
@zimbatm
Copy link
Member

zimbatm commented Aug 5, 2021

Result of nixpkgs-review pr 104310 run on x86_64-linux 1

2 packages built:
  • terraform-full
  • terraform-providers.datadog

@zimbatm zimbatm merged commit d1dfdf7 into NixOS:master Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants