Merge pull request #2 from Yohan460/api-update

Go Update and Library Update

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.18
       -
         name: Import GPG key
         id: import_gpg

.go-version

@@ -1 +1 @@
-1.15.5
+1.18

go.mod

@@ -1,34 +1,73 @@
 module github.com/yohan460/terraform-provider-jamf
 
-go 1.15
+go 1.18
 
 require (
+	github.com/hashicorp/go-cleanhttp v0.5.2
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
+	github.com/mitchellh/go-homedir v1.1.0
+	github.com/yohan460/go-jamf-api v0.0.0-20221116181400-9279a31bfd4c
+)
+
+require (
+	cloud.google.com/go v0.61.0 // indirect
+	cloud.google.com/go/storage v1.10.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
+	github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.25.3 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/bradfitz/slice v0.0.0-20180809154707-2b758aa73013 // indirect
+	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.10.0 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-cmp v0.5.4 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
+	github.com/hashicorp/go-getter v1.5.0 // indirect
 	github.com/hashicorp/go-hclog v0.15.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/go-plugin v1.4.0 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
+	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/hashicorp/hcl/v2 v2.8.2 // indirect
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-exec v0.13.0 // indirect
+	github.com/hashicorp/terraform-json v0.8.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.2.1 // indirect
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/copystructure v1.1.1 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/oklog/run v1.1.0 // indirect
-	github.com/yohan460/go-jamf-api v0.0.0-20210220234158-7885a6f2c0be
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/ulikunitz/xz v0.5.8 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/zclconf/go-cty v1.7.1 // indirect
+	go.opencensus.io v0.22.4 // indirect
 	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/mod v0.3.0 // indirect
 	golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 // indirect
 	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+	google.golang.org/api v0.29.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20210219173056-d891e3cb3b5b // indirect
 	google.golang.org/grpc v1.35.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 )

jamf/resource_jamf_building.go

@@ -58,8 +58,6 @@ func resourceJamfBuilding() *schema.Resource {
 			},
 		},
 	}
-
-	return &schema.Resource{}
 }
 
 func buildJamfBuildingStruct(d *schema.ResourceData) *jamf.Building {

jamf/resource_jamf_category.go

@@ -39,8 +39,6 @@ func resourceJamfCategory() *schema.Resource {
 			},
 		},
 	}
-
-	return &schema.Resource{}
 }
 
 func buildJamfCategoryStruct(d *schema.ResourceData) *jamf.Category {

jamf/resource_jamf_department.go

@@ -34,8 +34,6 @@ func resourceJamfDepartment() *schema.Resource {
 			},
 		},
 	}
-
-	return &schema.Resource{}
 }
 
 func buildJamfDepartmentStruct(d *schema.ResourceData) *jamf.Department {

jamf/resource_jamf_staticComputerGroup.go

@@ -88,10 +88,10 @@ func buildJamfStaticComputerGroupStruct(d *schema.ResourceData) *jamf.ComputerGr
 
 	if v, ok := d.GetOk("computer"); ok {
 		comps := v.(*schema.Set).List()
-		compList := []jamf.Computer{}
+		compList := []jamf.ComputerGroupComputerEntry{}
 		for _, c := range comps {
 			compData := c.(map[string]interface{})
-			comp := jamf.Computer{}
+			comp := jamf.ComputerGroupComputerEntry{}
 			if val, ok := compData["id"].(int); ok {
 				comp.ID = val
 			}