Skip to content

Commit af260cb

Browse files
Add user group to application binding, upgrade 3rd-party imports, generic cleanup (#12)
* Remove broken tests * Update module path, license copyright * Bump `jcapi-go` to latest release * Bump `testify` to latest release * Bump `terraform-plugin-sdk` to latest `v1` release * Remove unused `resourceSystemGroupUserGroupMembership` * Bump go to 1.20, add indirect go.mod requires, go.sum * Fix go-staticcheck warnings * Add `jumpcloud_application` data source, `jumpcloud_user_group_association` resource * Upgrade to `terraform-plugin-sdk/v2` * Remove user_group attributes support * Add missing acceptance tests * Remove direct testify require * Implement context passing * Adjust attribute names for user_group_association, add importer * Add descriptions for application data_source * Bump Go version in README, GH action workflow
1 parent 2e9f860 commit af260cb

33 files changed

+753
-706
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: Set up Go
2929
uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.14
31+
go-version: 1.20
3232
-
3333
name: Import GPG key
3434
id: import_gpg

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MIT License
22

33
Copyright (c) 2018 cognotekt GmbH
4+
Copyright (c) 2023 Enthought, Inc.
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
## Requirements
44

55
- [Terraform](https://www.terraform.io/downloads.html) 0.13+
6-
- [Go](https://golang.org/doc/install) 1.14 (to build the provider plugin)
6+
- [Go](https://golang.org/doc/install) 1.20
77

88
## Building The Provider
99

10-
Clone repository to: `$GOPATH/src/github.com/cognotektgmbh/terraform-provider-jumpcloud`
10+
Clone repository to: `$GOPATH/src/github.com/enthought/terraform-provider-jumpcloud`
1111

1212
```sh
13-
mkdir -p $GOPATH/src/github.com/cognotektgmbh
14-
cd $GOPATH/src/github.com/cognotektgmbh
15-
git clone git@github.com:cognotektgmbh/terraform-provider-jumpcloud
13+
mkdir -p $GOPATH/src/github.com/enthought
14+
cd $GOPATH/src/github.com/enthought
15+
git clone git@github.com:enthought/terraform-provider-jumpcloud
1616
```
1717

1818
Enter the provider directory and build the provider
1919

2020
```sh
21-
cd $GOPATH/src/github.com/cognotektgmbh/terraform-provider-jumpcloud
21+
cd $GOPATH/src/github.com/enthought/terraform-provider-jumpcloud
2222
make build
2323
```
2424

examples/system-groups/users.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
resource "jumpcloud_user_group" "test_group" {
22
name = "test_group"
3-
attributes = {
4-
posix_groups = "32:testerino"
5-
}
63
}
74

85
resource "jumpcloud_user" "test_user1" {

examples/user-groups-with-ldap/main.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
resource "jumpcloud_user_group" "test_group" {
22
name = "test_group"
3-
attributes = {
4-
posix_groups = "32:testerino"
5-
}
63
}
74

85
resource "jumpcloud_user" "test_user1" {

examples/user-groups/main.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
resource "jumpcloud_user_group" "test_group" {
22
name = "test_group"
3-
attributes = {
4-
posix_groups = "32:testerino"
5-
}
63
}
74

85
resource "jumpcloud_user" "test_user1" {

go.mod

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,59 @@
1-
module github.com/cognotektgmbh/terraform-provider-jumpcloud
1+
module github.com/enthought/terraform-provider-jumpcloud
22

3-
go 1.15
3+
go 1.20
44

55
require (
6-
github.com/TheJumpCloud/jcapi-go v2.4.0+incompatible
7-
github.com/hashicorp/terraform-plugin-sdk v1.13.1
8-
github.com/stretchr/testify v1.5.1
6+
github.com/TheJumpCloud/jcapi-go v3.0.0+incompatible
7+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.27.0
8+
)
9+
10+
require (
11+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
12+
github.com/agext/levenshtein v1.2.2 // indirect
13+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
14+
github.com/cloudflare/circl v1.3.3 // indirect
15+
github.com/fatih/color v1.13.0 // indirect
16+
github.com/golang/protobuf v1.5.3 // indirect
17+
github.com/google/go-cmp v0.5.9 // indirect
18+
github.com/hashicorp/errwrap v1.0.0 // indirect
19+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
20+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
21+
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
22+
github.com/hashicorp/go-hclog v1.5.0 // indirect
23+
github.com/hashicorp/go-multierror v1.1.1 // indirect
24+
github.com/hashicorp/go-plugin v1.4.10 // indirect
25+
github.com/hashicorp/go-uuid v1.0.3 // indirect
26+
github.com/hashicorp/go-version v1.6.0 // indirect
27+
github.com/hashicorp/hc-install v0.5.2 // indirect
28+
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
29+
github.com/hashicorp/logutils v1.0.0 // indirect
30+
github.com/hashicorp/terraform-exec v0.18.1 // indirect
31+
github.com/hashicorp/terraform-json v0.17.0 // indirect
32+
github.com/hashicorp/terraform-plugin-go v0.16.0 // indirect
33+
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
34+
github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
35+
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
36+
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
37+
github.com/mattn/go-colorable v0.1.12 // indirect
38+
github.com/mattn/go-isatty v0.0.14 // indirect
39+
github.com/mitchellh/copystructure v1.2.0 // indirect
40+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
41+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
42+
github.com/mitchellh/mapstructure v1.5.0 // indirect
43+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
44+
github.com/oklog/run v1.0.0 // indirect
45+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
46+
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
47+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
48+
github.com/zclconf/go-cty v1.13.2 // indirect
49+
golang.org/x/crypto v0.10.0 // indirect
50+
golang.org/x/mod v0.10.0 // indirect
51+
golang.org/x/net v0.11.0 // indirect
52+
golang.org/x/oauth2 v0.7.0 // indirect
53+
golang.org/x/sys v0.9.0 // indirect
54+
golang.org/x/text v0.10.0 // indirect
55+
google.golang.org/appengine v1.6.7 // indirect
56+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
57+
google.golang.org/grpc v1.56.0 // indirect
58+
google.golang.org/protobuf v1.30.0 // indirect
959
)

0 commit comments

Comments
 (0)