Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

terraform-providers: new providers + version bumps #52937

Merged
merged 3 commits into from Jan 18, 2019
Merged

terraform-providers: new providers + version bumps #52937

merged 3 commits into from Jan 18, 2019

Conversation

stephengroat
Copy link
Contributor

@stephengroat stephengroat commented Dec 26, 2018 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Mic92
Mic92 reviewed Jan 18, 2019
View reviewed changes
pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -7,7 +7,7 @@
# <organisation>/<repo> - include only the named repository.

# include all terraform-providers
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\)
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\)
Copy link
Member

Choose a reason for hiding this comment

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

Do you know why those where disabled in the first place?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

from what i can tell, these providers weren't tagged with git versions for a long time (which prevented the update-all script from working).

I can remove these if needed, just saw that there were versioned now

Copy link
Member

Choose a reason for hiding this comment

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

google-beta is also desirable to have, not sure about skytap

they are pulling out all the beta features from the google provider and moving them into google-beta, but a lot of google feature stay in beta for a long time

@Mic92 Mic92 requested a review from zimbatm January 18, 2019 16:17
zimbatm
zimbatm requested changes Jan 18, 2019
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

google and google-beta are colliding when building the full version of terraform:

$ nix-build nixpkgs/ -A terraform.full
these derivations will be built:
  /nix/store/yz2psm8bpcrq6nw7z5my2x903ih81km1-tf-plugin-env.drv
  /nix/store/hv2429i5746vwqla08fh0sh3swsdzfk5-terraform-0.11.11.drv
building '/nix/store/yz2psm8bpcrq6nw7z5my2x903ih81km1-tf-plugin-env.drv'...
collision between `/nix/store/z673jw5bflk84chhd90iiys6w8d7pl39-terraform-provider-google-beta-1.20.0-bin/bin/scripts' and `/nix/store/g6f2qc9pp7cqk5q53sl5by4hs83dlmzn-terraform-provider-google-1.20.0-bin/bin/scripts'
builder for '/nix/store/yz2psm8bpcrq6nw7z5my2x903ih81km1-tf-plugin-env.drv' failed with exit code 25
cannot build derivation '/nix/store/hv2429i5746vwqla08fh0sh3swsdzfk5-terraform-0.11.11.drv': 1 dependencies couldn't be built
error: build of '/nix/store/hv2429i5746vwqla08fh0sh3swsdzfk5-terraform-0.11.11.drv' failed

@zimbatm
Copy link
Member

zimbatm commented Jan 18, 2019 

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 040e5161bc1..702a7cb7eb1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -11,7 +11,6 @@ let
       inherit (data) owner repo version sha256;
       name = "${repo}-${version}";
       goPackagePath = "github.com/${owner}/${repo}";
+      subPackages = [ "." ];
       src = fetchFromGitHub {
         inherit owner repo sha256;
         rev = "v${version}";

@zimbatm zimbatm merged commit 8baa0a4 into NixOS:master Jan 18, 2019
@stephengroat
Copy link
Contributor Author

@zimbatm thanks for the help!

@stephengroat stephengroat deleted the patch-4 branch January 18, 2019 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@zimbatm zimbatm zimbatm approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@stephengroat @zimbatm @Mic92 @GrahamcOfBorg