From 98cf280960b90e541d5c10cd746a2ed78dda8c2c Mon Sep 17 00:00:00 2001 From: kaovd Date: Sat, 11 Dec 2021 18:31:56 +0000 Subject: [PATCH 1/9] Add Types, move catalogs and packages to 1.0 Stable --- msgraph/accesspackage.go | 2 +- msgraph/accesspackage_test.go | 7 ++++--- msgraph/accesspackageassignmentpolicy_test.go | 13 +++++++------ msgraph/accesspackagecatalog.go | 12 ++++++------ msgraph/accesspackagecatalog_test.go | 2 +- msgraph/accesspackageresourcerequest_test.go | 15 ++++++++------- msgraph/accesspackageresourcerolescope_test.go | 15 ++++++++------- msgraph/models.go | 10 +++------- msgraph/valuetypes.go | 5 +++-- odata/types.go | 2 ++ 10 files changed, 43 insertions(+), 40 deletions(-) diff --git a/msgraph/accesspackage.go b/msgraph/accesspackage.go index e89efb84..4a9d8f44 100644 --- a/msgraph/accesspackage.go +++ b/msgraph/accesspackage.go @@ -17,7 +17,7 @@ type AccessPackageClient struct { func NewAccessPackageClient(tenantId string) *AccessPackageClient { return &AccessPackageClient{ - BaseClient: NewClient(VersionBeta, tenantId), + BaseClient: NewClient(Version10, tenantId), } } diff --git a/msgraph/accesspackage_test.go b/msgraph/accesspackage_test.go index 880923d3..b764b3b8 100644 --- a/msgraph/accesspackage_test.go +++ b/msgraph/accesspackage_test.go @@ -20,10 +20,11 @@ func TestAccessPackageClient(t *testing.T) { // Create AP accessPackage := testAccessPackageClient_Create(t, c, msgraph.AccessPackage{ DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - CatalogId: accessPackageCatalog.ID, + Catalog: &msgraph.AccessPackageCatalog{ + ID: accessPackageCatalog.ID, + }, Description: utils.StringPtr("Test Access Package"), IsHidden: utils.BoolPtr(false), - IsRoleScopesVisible: utils.BoolPtr(false), }) // Update test @@ -111,7 +112,7 @@ func testapCatalog_Create(t *testing.T, c *test.Test) (accessPackageCatalog *msg accessPackageCatalog, _, err := c.AccessPackageCatalogClient.Create(c.Context, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - CatalogStatus: msgraph.AccessPackageCatalogStatusPublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go index 182bce22..46fe4299 100644 --- a/msgraph/accesspackageassignmentpolicy_test.go +++ b/msgraph/accesspackageassignmentpolicy_test.go @@ -128,11 +128,12 @@ func testAccessPackageAssignmentPolicyClient_Delete(t *testing.T, c *test.Test, func testAccessPackage_Create(t *testing.T, c *test.Test, accessPackageCatalog *msgraph.AccessPackageCatalog) (accessPackage *msgraph.AccessPackage) { accessPackage, _, err := c.AccessPackageClient.Create(c.Context, msgraph.AccessPackage{ - DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - CatalogId: accessPackageCatalog.ID, - Description: utils.StringPtr("Test Access Package"), - IsHidden: utils.BoolPtr(false), - IsRoleScopesVisible: utils.BoolPtr(false), + DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), + Catalog: &msgraph.AccessPackageCatalog{ + ID: accessPackageCatalog.ID, + }, + Description: utils.StringPtr("Test Access Package"), + IsHidden: utils.BoolPtr(false), }) if err != nil { @@ -154,7 +155,7 @@ func testAccessPackageCatalog_Create(t *testing.T, c *test.Test) (accessPackageC accessPackageCatalog, _, err := c.AccessPackageCatalogClient.Create(c.Context, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - CatalogStatus: msgraph.AccessPackageCatalogStatusPublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/accesspackagecatalog.go b/msgraph/accesspackagecatalog.go index e417c024..e83d34cc 100644 --- a/msgraph/accesspackagecatalog.go +++ b/msgraph/accesspackagecatalog.go @@ -17,7 +17,7 @@ type AccessPackageCatalogClient struct { func NewAccessPackageCatalogClient(tenantId string) *AccessPackageCatalogClient { return &AccessPackageCatalogClient{ - BaseClient: NewClient(VersionBeta, tenantId), + BaseClient: NewClient(Version10, tenantId), } } @@ -28,7 +28,7 @@ func (c *AccessPackageCatalogClient) List(ctx context.Context, query odata.Query OData: query, ValidStatusCodes: []int{http.StatusOK}, Uri: Uri{ - Entity: "/identityGovernance/entitlementManagement/accessPackageCatalogs", + Entity: "/identityGovernance/entitlementManagement/catalogs", HasTenantId: true, }, }) @@ -64,7 +64,7 @@ func (c *AccessPackageCatalogClient) Create(ctx context.Context, accessPackageCa Body: body, ValidStatusCodes: []int{http.StatusCreated}, Uri: Uri{ - Entity: "/identityGovernance/entitlementManagement/accessPackageCatalogs", + Entity: "/identityGovernance/entitlementManagement/catalogs", HasTenantId: true, }, }) @@ -93,7 +93,7 @@ func (c *AccessPackageCatalogClient) Get(ctx context.Context, id string, query o OData: query, ValidStatusCodes: []int{http.StatusOK}, Uri: Uri{ - Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/accessPackageCatalogs/%s", id), + Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/catalogs/%s", id), HasTenantId: true, }, }) @@ -133,7 +133,7 @@ func (c *AccessPackageCatalogClient) Update(ctx context.Context, accessPackageCa ConsistencyFailureFunc: RetryOn404ConsistencyFailureFunc, ValidStatusCodes: []int{http.StatusNoContent}, Uri: Uri{ - Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/accessPackageCatalogs/%s", *accessPackageCatalog.ID), + Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/catalogs/%s", *accessPackageCatalog.ID), HasTenantId: true, }, }) @@ -150,7 +150,7 @@ func (c *AccessPackageCatalogClient) Delete(ctx context.Context, id string) (int ConsistencyFailureFunc: RetryOn404ConsistencyFailureFunc, ValidStatusCodes: []int{http.StatusNoContent}, Uri: Uri{ - Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/accessPackageCatalogs/%s", id), + Entity: fmt.Sprintf("/identityGovernance/entitlementManagement/catalogs/%s", id), HasTenantId: true, }, }) diff --git a/msgraph/accesspackagecatalog_test.go b/msgraph/accesspackagecatalog_test.go index 7b2022d8..1556a818 100644 --- a/msgraph/accesspackagecatalog_test.go +++ b/msgraph/accesspackagecatalog_test.go @@ -17,7 +17,7 @@ func TestAccessPackageCatalogClient(t *testing.T) { accessPackageCatalog := testAccessPackageCatalogClient_Create(t, c, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - CatalogStatus: msgraph.AccessPackageCatalogStatusPublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/accesspackageresourcerequest_test.go b/msgraph/accesspackageresourcerequest_test.go index eb3b4e79..ab95cdb4 100644 --- a/msgraph/accesspackageresourcerequest_test.go +++ b/msgraph/accesspackageresourcerequest_test.go @@ -24,16 +24,17 @@ func TestAccessPackageResourceRequestClient(t *testing.T) { // Create access package accessPackage := testAccessPackageResourceRequestAP_Create(t, c, msgraph.AccessPackage{ - DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - CatalogId: accessPackageCatalog.ID, - Description: utils.StringPtr("Test Access Package"), - IsHidden: utils.BoolPtr(false), - IsRoleScopesVisible: utils.BoolPtr(false), + DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), + Catalog: &msgraph.AccessPackageCatalog{ + ID: accessPackageCatalog.ID, + }, + Description: utils.StringPtr("Test Access Package"), + IsHidden: utils.BoolPtr(false), }) // Create resource request and poll for ID accessPackageResourceRequest := testAccessPackageResourceRequestClient_Create(t, c, msgraph.AccessPackageResourceRequest{ - CatalogId: accessPackage.CatalogId, + CatalogId: accessPackage.Catalog.ID, RequestType: utils.StringPtr("AdminAdd"), AccessPackageResource: &msgraph.AccessPackageResource{ OriginId: aadGroup.ID, @@ -145,7 +146,7 @@ func testAccessPackageResourceRequestCatalog_Create(t *testing.T, c *test.Test) accessPackageCatalog, _, err := c.AccessPackageCatalogClient.Create(c.Context, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - CatalogStatus: msgraph.AccessPackageCatalogStatusPublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/accesspackageresourcerolescope_test.go b/msgraph/accesspackageresourcerolescope_test.go index 90779d50..e7b8f765 100644 --- a/msgraph/accesspackageresourcerolescope_test.go +++ b/msgraph/accesspackageresourcerolescope_test.go @@ -24,16 +24,17 @@ func TestAccessPackageResourceRoleScopeClient(t *testing.T) { // Create access package accessPackage := testAccessPackageResourceRoleScopeAP_Create(t, c, msgraph.AccessPackage{ - DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - CatalogId: accessPackageCatalog.ID, - Description: utils.StringPtr("Test Access Package"), - IsHidden: utils.BoolPtr(false), - IsRoleScopesVisible: utils.BoolPtr(false), + DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), + Catalog: &msgraph.AccessPackageCatalog{ + ID: accessPackageCatalog.ID, + }, + Description: utils.StringPtr("Test Access Package"), + IsHidden: utils.BoolPtr(false), }) // Create Resource Request and poll for ID accessPackageResourceRequest := testAccessPackageResourceRoleScopeResourceRequest_Create(t, c, msgraph.AccessPackageResourceRequest{ - CatalogId: accessPackage.CatalogId, + CatalogId: accessPackage.Catalog.ID, RequestType: utils.StringPtr("AdminAdd"), AccessPackageResource: &msgraph.AccessPackageResource{ OriginId: aadGroup.ID, @@ -210,7 +211,7 @@ func testAccessPackageResourceRoleScopeCatalog_Create(t *testing.T, c *test.Test accessPackageCatalog, _, err := c.AccessPackageCatalogClient.Create(c.Context, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - CatalogStatus: msgraph.AccessPackageCatalogStatusPublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/models.go b/msgraph/models.go index d8dcec62..8e3db04f 100644 --- a/msgraph/models.go +++ b/msgraph/models.go @@ -14,14 +14,11 @@ import ( type AccessPackage struct { ID *string `json:"id,omitempty"` - CatalogId *string `json:"catalogId,omitempty"` - CreatedBy *string `json:"createdBy,omitempty"` + Catalog *AccessPackageCatalog `json:"catalog,omitempty"` CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` Description *string `json:"description,omitempty"` DisplayName *string `json:"displayName,omitempty"` IsHidden *bool `json:"isHidden,omitempty"` - IsRoleScopesVisible *bool `json:"isRoleScopesVisible,omitempty"` - ModifiedBy *string `json:"modifiedBy,omitempty"` ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` } @@ -45,14 +42,12 @@ type AccessPackageAssignmentPolicy struct { type AccessPackageCatalog struct { ID *string `json:"id,omitempty"` - CatalogStatus AccessPackageCatalogStatus `json:"catalogStatus,omitempty"` + State AccessPackageCatalogState `json:"state,omitempty"` CatalogType AccessPackageCatalogType `json:"catalogType,omitempty"` - CreatedBy *string `json:"createdBy,omitempty"` CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` Description *string `json:"description,omitempty"` DisplayName *string `json:"displayName,omitempty"` IsExternallyVisible *bool `json:"isExternallyVisible,omitempty"` - ModifiedBy *string `json:"modifiedBy,omitempty"` ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` } @@ -1497,6 +1492,7 @@ type UserRegistrationMethodSummary struct { } type UserSet struct { + ODataType *odata.Type `json:"@odata.type,omitempty"` IsBackup *bool `json:"isBackup,omitempty"` ID *string `json:"id,omitempty"` // Either user or group ID Description *string `json:"description,omitempty"` diff --git a/msgraph/valuetypes.go b/msgraph/valuetypes.go index 0887fd0b..ca87c3a8 100644 --- a/msgraph/valuetypes.go +++ b/msgraph/valuetypes.go @@ -22,10 +22,11 @@ func (s StringNullWhenEmpty) MarshalJSON() ([]byte, error) { return json.Marshal(string(s)) } -type AccessPackageCatalogStatus = string +type AccessPackageCatalogState = string const ( - AccessPackageCatalogStatusPublished AccessPackageCatalogStatus = "Published" + AccessPackageCatalogStatePublished AccessPackageCatalogState = "published" + AccessPackageCatalogStateUnpublished AccessPackageCatalogState = "unpublished" ) type AccessPackageCatalogType = string diff --git a/odata/types.go b/odata/types.go index 0f6976d9..2c30bccc 100644 --- a/odata/types.go +++ b/odata/types.go @@ -22,6 +22,7 @@ const ( ShortTypeGroup ShortType = "group" ShortTypeGroupMembers ShortType = "groupMembers" ShortTypeIpNamedLocation ShortType = "ipNamedLocation" + ShortTypeInternalSponsors ShortType = "internalSponsors" ShortTypeNamedLocation ShortType = "namedLocation" ShortTypeMicrosoftAuthenticatorAuthenticationMethod ShortType = "microsoftAuthenticatorAuthenticationMethod" ShortTypeOrganization ShortType = "organization" @@ -57,6 +58,7 @@ const ( TypeGroup Type = "#microsoft.graph.group" TypeGroupMembers Type = "#microsoft.graph.groupMembers" TypeIpNamedLocation Type = "#microsoft.graph.ipNamedLocation" + TypeInternalSponsors Type = "#microsoft.graph.internalSponsors" TypeNamedLocation Type = "#microsoft.graph.namedLocation" TypeMicrosoftAuthenticatorAuthenticationMethod Type = "#microsoft.graph.microsoftAuthenticatorAuthenticationMethod" TypeOrganization Type = "#microsoft.graph.organization" From ea99394530d9bf8e6827660dde5aa2c761efedf3 Mon Sep 17 00:00:00 2001 From: kaovd Date: Sat, 11 Dec 2021 19:17:24 +0000 Subject: [PATCH 2/9] Fmt, fix idempotency --- msgraph/accesspackage.go | 4 +++ msgraph/accesspackage_test.go | 10 +++--- msgraph/accesspackageassignmentpolicy_test.go | 2 +- msgraph/accesspackageresourcerequest_test.go | 2 +- .../accesspackageresourcerolescope_test.go | 2 +- msgraph/models.go | 36 +++++++++---------- msgraph/valuetypes.go | 2 +- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/msgraph/accesspackage.go b/msgraph/accesspackage.go index 4a9d8f44..99f23f99 100644 --- a/msgraph/accesspackage.go +++ b/msgraph/accesspackage.go @@ -83,6 +83,10 @@ func (c *AccessPackageClient) Create(ctx context.Context, accessPackage AccessPa return nil, status, fmt.Errorf("json.Unmarshal(): %v", err) } + newAccessPackage.Catalog = &AccessPackageCatalog{ + ID: accessPackage.Catalog.ID, + } //Stable API doesn't return this + return &newAccessPackage, status, nil } diff --git a/msgraph/accesspackage_test.go b/msgraph/accesspackage_test.go index b764b3b8..2a1cd55a 100644 --- a/msgraph/accesspackage_test.go +++ b/msgraph/accesspackage_test.go @@ -19,12 +19,12 @@ func TestAccessPackageClient(t *testing.T) { // Create AP accessPackage := testAccessPackageClient_Create(t, c, msgraph.AccessPackage{ - DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - Catalog: &msgraph.AccessPackageCatalog{ + DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), + Catalog: &msgraph.AccessPackageCatalog{ ID: accessPackageCatalog.ID, }, - Description: utils.StringPtr("Test Access Package"), - IsHidden: utils.BoolPtr(false), + Description: utils.StringPtr("Test Access Package"), + IsHidden: utils.BoolPtr(false), }) // Update test @@ -112,7 +112,7 @@ func testapCatalog_Create(t *testing.T, c *test.Test) (accessPackageCatalog *msg accessPackageCatalog, _, err := c.AccessPackageCatalogClient.Create(c.Context, msgraph.AccessPackageCatalog{ DisplayName: utils.StringPtr(fmt.Sprintf("test-catalog-%s", c.RandomString)), CatalogType: msgraph.AccessPackageCatalogTypeUserManaged, - State: msgraph.AccessPackageCatalogStatePublished, + State: msgraph.AccessPackageCatalogStatePublished, Description: utils.StringPtr("Test Access Catalog"), IsExternallyVisible: utils.BoolPtr(false), }) diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go index 46fe4299..4875ad16 100644 --- a/msgraph/accesspackageassignmentpolicy_test.go +++ b/msgraph/accesspackageassignmentpolicy_test.go @@ -129,7 +129,7 @@ func testAccessPackageAssignmentPolicyClient_Delete(t *testing.T, c *test.Test, func testAccessPackage_Create(t *testing.T, c *test.Test, accessPackageCatalog *msgraph.AccessPackageCatalog) (accessPackage *msgraph.AccessPackage) { accessPackage, _, err := c.AccessPackageClient.Create(c.Context, msgraph.AccessPackage{ DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - Catalog: &msgraph.AccessPackageCatalog{ + Catalog: &msgraph.AccessPackageCatalog{ ID: accessPackageCatalog.ID, }, Description: utils.StringPtr("Test Access Package"), diff --git a/msgraph/accesspackageresourcerequest_test.go b/msgraph/accesspackageresourcerequest_test.go index ab95cdb4..9df4c4c9 100644 --- a/msgraph/accesspackageresourcerequest_test.go +++ b/msgraph/accesspackageresourcerequest_test.go @@ -25,7 +25,7 @@ func TestAccessPackageResourceRequestClient(t *testing.T) { // Create access package accessPackage := testAccessPackageResourceRequestAP_Create(t, c, msgraph.AccessPackage{ DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - Catalog: &msgraph.AccessPackageCatalog{ + Catalog: &msgraph.AccessPackageCatalog{ ID: accessPackageCatalog.ID, }, Description: utils.StringPtr("Test Access Package"), diff --git a/msgraph/accesspackageresourcerolescope_test.go b/msgraph/accesspackageresourcerolescope_test.go index e7b8f765..fded0253 100644 --- a/msgraph/accesspackageresourcerolescope_test.go +++ b/msgraph/accesspackageresourcerolescope_test.go @@ -25,7 +25,7 @@ func TestAccessPackageResourceRoleScopeClient(t *testing.T) { // Create access package accessPackage := testAccessPackageResourceRoleScopeAP_Create(t, c, msgraph.AccessPackage{ DisplayName: utils.StringPtr(fmt.Sprintf("test-accesspackage-%s", c.RandomString)), - Catalog: &msgraph.AccessPackageCatalog{ + Catalog: &msgraph.AccessPackageCatalog{ ID: accessPackageCatalog.ID, }, Description: utils.StringPtr("Test Access Package"), diff --git a/msgraph/models.go b/msgraph/models.go index 8e3db04f..273caaa7 100644 --- a/msgraph/models.go +++ b/msgraph/models.go @@ -13,13 +13,13 @@ import ( ) type AccessPackage struct { - ID *string `json:"id,omitempty"` - Catalog *AccessPackageCatalog `json:"catalog,omitempty"` - CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` - Description *string `json:"description,omitempty"` - DisplayName *string `json:"displayName,omitempty"` - IsHidden *bool `json:"isHidden,omitempty"` - ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` + ID *string `json:"id,omitempty"` + Catalog *AccessPackageCatalog `json:"catalog,omitempty"` + CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` + Description *string `json:"description,omitempty"` + DisplayName *string `json:"displayName,omitempty"` + IsHidden *bool `json:"isHidden,omitempty"` + ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` } type AccessPackageAssignmentPolicy struct { @@ -41,14 +41,14 @@ type AccessPackageAssignmentPolicy struct { } type AccessPackageCatalog struct { - ID *string `json:"id,omitempty"` - State AccessPackageCatalogState `json:"state,omitempty"` - CatalogType AccessPackageCatalogType `json:"catalogType,omitempty"` - CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` - Description *string `json:"description,omitempty"` - DisplayName *string `json:"displayName,omitempty"` - IsExternallyVisible *bool `json:"isExternallyVisible,omitempty"` - ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` + ID *string `json:"id,omitempty"` + State AccessPackageCatalogState `json:"state,omitempty"` + CatalogType AccessPackageCatalogType `json:"catalogType,omitempty"` + CreatedDateTime *time.Time `json:"createdDateTime,omitempty"` + Description *string `json:"description,omitempty"` + DisplayName *string `json:"displayName,omitempty"` + IsExternallyVisible *bool `json:"isExternallyVisible,omitempty"` + ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` } type AccessPackageLocalizedContent struct { @@ -1493,9 +1493,9 @@ type UserRegistrationMethodSummary struct { type UserSet struct { ODataType *odata.Type `json:"@odata.type,omitempty"` - IsBackup *bool `json:"isBackup,omitempty"` - ID *string `json:"id,omitempty"` // Either user or group ID - Description *string `json:"description,omitempty"` + IsBackup *bool `json:"isBackup,omitempty"` + ID *string `json:"id,omitempty"` // Either user or group ID + Description *string `json:"description,omitempty"` } type UserCredentialUsageDetails struct { diff --git a/msgraph/valuetypes.go b/msgraph/valuetypes.go index ca87c3a8..dfe30a82 100644 --- a/msgraph/valuetypes.go +++ b/msgraph/valuetypes.go @@ -25,7 +25,7 @@ func (s StringNullWhenEmpty) MarshalJSON() ([]byte, error) { type AccessPackageCatalogState = string const ( - AccessPackageCatalogStatePublished AccessPackageCatalogState = "published" + AccessPackageCatalogStatePublished AccessPackageCatalogState = "published" AccessPackageCatalogStateUnpublished AccessPackageCatalogState = "unpublished" ) From ccfc589fefd04852ce33cfbdaf71c2a50a20acee Mon Sep 17 00:00:00 2001 From: kaovd Date: Fri, 17 Dec 2021 20:25:15 +0000 Subject: [PATCH 3/9] Add tests and models to fix odata requirement in questions collection --- msgraph/accesspackageassignmentpolicy_test.go | 72 ++++++++++++++++++- msgraph/models.go | 17 +++-- odata/types.go | 6 ++ 3 files changed, 90 insertions(+), 5 deletions(-) diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go index 4875ad16..b4e47cea 100644 --- a/msgraph/accesspackageassignmentpolicy_test.go +++ b/msgraph/accesspackageassignmentpolicy_test.go @@ -27,9 +27,17 @@ func TestAccessPackageAssignmentPolicyClient(t *testing.T) { Description: utils.StringPtr("Test AP Policy Assignment Description"), //AccessReviewSettings: utils.BoolPtr() RequestorSettings: &msgraph.RequestorSettings{ + //ScopeType: msgraph.RequestorSettingsScopeTypeSpecificDirectorySubjects, ScopeType: msgraph.RequestorSettingsScopeTypeNoSubjects, AcceptRequests: utils.BoolPtr(true), - //AllowedRequestors: &msgraph.UserSet{} + // AllowedRequestors: &[]msgraph.UserSet{ + // { + // ODataType: utils.StringPtr(odata.TypeGroupMembers), + // IsBackup: utils.BoolPtr(false), + // ID: utils.StringPtr("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"), + // Description: utils.StringPtr("Sample users group"), + // }, + // }, }, RequestApprovalSettings: &msgraph.ApprovalSettings{ IsApprovalRequired: utils.BoolPtr(false), @@ -38,6 +46,68 @@ func TestAccessPackageAssignmentPolicyClient(t *testing.T) { ApprovalMode: msgraph.ApprovalModeNoApproval, //ApprovalStages: &msgraph.ApprovalStages{}, }, + Questions: &[]msgraph.AccessPackageQuestion{ + { + ODataType: utils.StringPtr(odata.TypeAccessPackageTextInputQuestion), + IsRequired: utils.BoolPtr(false), + Sequence: utils.Int32Ptr(1), + Text: &msgraph.AccessPackageLocalizedContent{ + DefaultText: utils.StringPtr("Test"), + LocalizedTexts: &[]msgraph.AccessPackageLocalizedTexts{ + { + Text: utils.StringPtr("abc"), + LanguageCode: utils.StringPtr("en"), + }, + }, + }, + }, + { + ODataType: utils.StringPtr(odata.TypeAccessPackageMultipleChoiceQuestion), + IsRequired: utils.BoolPtr(false), + Sequence: utils.Int32Ptr(2), + Text: &msgraph.AccessPackageLocalizedContent{ + DefaultText: utils.StringPtr("Test"), + LocalizedTexts: &[]msgraph.AccessPackageLocalizedTexts{ + { + Text: utils.StringPtr("abc 2"), + LanguageCode: utils.StringPtr("gb"), + }, + }, + }, + Choices: &[]msgraph.AccessPackageMultipleChoiceQuestions{ + // Choice 1 containing a list of languages + { + ActualValue: utils.StringPtr("CHOICE1"), + DisplayValue: &msgraph.AccessPackageLocalizedContent{ + DefaultText: utils.StringPtr("One"), + LocalizedTexts: &[]msgraph.AccessPackageLocalizedTexts{ + { + Text: utils.StringPtr("Choice 1"), + LanguageCode: utils.StringPtr("gb"), + }, + }, + }, + }, + // Choice 2 containing a list of languages, etc. + { + ActualValue: utils.StringPtr("CHOICE2"), + DisplayValue: &msgraph.AccessPackageLocalizedContent{ + DefaultText: utils.StringPtr("Two"), + LocalizedTexts: &[]msgraph.AccessPackageLocalizedTexts{ + { + Text: utils.StringPtr("Choice 2"), + LanguageCode: utils.StringPtr("gb"), + }, + { + Text: utils.StringPtr("Zwei"), + LanguageCode: utils.StringPtr("de"), + }, + }, + }, + }, + }, + }, + }, }) testAccessPackageAssignmentPolicyClient_Get(t, c, *accessPackageAssignmentPolicy.ID) diff --git a/msgraph/models.go b/msgraph/models.go index 273caaa7..98b633d3 100644 --- a/msgraph/models.go +++ b/msgraph/models.go @@ -62,10 +62,19 @@ type AccessPackageLocalizedTexts struct { } type AccessPackageQuestion struct { - ID *string `json:"id,omitempty"` - IsRequired *bool `json:"isRequired,omitempty"` - Sequence *int32 `json:"sequence,omitempty"` - Text *AccessPackageLocalizedContent `json:"text,omitempty"` + ODataType *odata.Type `json:"@odata.type,omitempty"` + ID *string `json:"id,omitempty"` + IsRequired *bool `json:"isRequired,omitempty"` + Sequence *int32 `json:"sequence,omitempty"` + Text *AccessPackageLocalizedContent `json:"text,omitempty"` + Choices *[]AccessPackageMultipleChoiceQuestions `json:"choices,omitempty"` + IsSingleLineQuestion *bool `json:"isSingleLineQuestion,omitempty"` +} + +type AccessPackageMultipleChoiceQuestions struct { + ODataType *odata.Type `json:"@odata.type,omitempty"` + ActualValue *string `json:"actualValue,string"` + DisplayValue *AccessPackageLocalizedContent `json:"displayValue,omitempty"` } type AccessPackageResource struct { diff --git a/odata/types.go b/odata/types.go index 2c30bccc..94f4ab15 100644 --- a/odata/types.go +++ b/odata/types.go @@ -7,6 +7,9 @@ const ( ShortTypeAccessPackageAssignmentPolicy ShortType = "accessPackageAssignmentPolicy" ShortTypeAccessPackageCatalog ShortType = "accessPackageCatalog" ShortTypeAccessPackageResourceRequest ShortType = "accessPackageResourceRequest" + ShortTypeAccessPackageQuestion Type = "accessPackageQuestion" + ShortTypeAccessPackageTextInputQuestion Type = "accessPackageTextInputQuestion" + ShortTypeAccessPackageMultipleChoiceQuestion Type = "accessPackageMultipleChoiceQuestion" ShortTypeAdministrativeUnit ShortType = "administrativeUnit" ShortTypeApplication ShortType = "application" ShortTypeConditionalAccessPolicy ShortType = "conditionalAccessPolicy" @@ -41,6 +44,9 @@ type Type = string const ( TypeAccessPackage Type = "#microsoft.graph.accessPackage" TypeAccessPackageAssignmentPolicy Type = "#microsoft.graph.accessPackageAssignmentPolicy" + TypeAccessPackageQuestion Type = "#microsoft.graph.accessPackageQuestion" + TypeAccessPackageTextInputQuestion Type = "#microsoft.graph.accessPackageTextInputQuestion" + TypeAccessPackageMultipleChoiceQuestion Type = "#microsoft.graph.accessPackageMultipleChoiceQuestion" TypeAccessPackageCatalog Type = "#microsoft.graph.accessPackageCatalog" TypeAccessPackageResourceRequest Type = "#microsoft.graph.accessPackageResourceRequest" TypeAdministrativeUnit Type = "#microsoft.graph.administrativeUnit" From 431295e177a203dcc1c2490401241d64ee4b1f73 Mon Sep 17 00:00:00 2001 From: kaovd Date: Wed, 22 Dec 2021 15:22:01 +0000 Subject: [PATCH 4/9] Fix fmt, make compatible with beta --- msgraph/accesspackage.go | 8 +++++--- msgraph/models.go | 9 +++++++++ msgraph/valuetypes.go | 7 +++++++ odata/types.go | 10 +++++----- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/msgraph/accesspackage.go b/msgraph/accesspackage.go index 99f23f99..aa026555 100644 --- a/msgraph/accesspackage.go +++ b/msgraph/accesspackage.go @@ -83,9 +83,11 @@ func (c *AccessPackageClient) Create(ctx context.Context, accessPackage AccessPa return nil, status, fmt.Errorf("json.Unmarshal(): %v", err) } - newAccessPackage.Catalog = &AccessPackageCatalog{ - ID: accessPackage.Catalog.ID, - } //Stable API doesn't return this + if c.BaseClient.ApiVersion == Version10 { + newAccessPackage.Catalog = &AccessPackageCatalog{ + ID: accessPackage.Catalog.ID, + } //Stable API doesn't return this + } return &newAccessPackage, status, nil } diff --git a/msgraph/models.go b/msgraph/models.go index 98b633d3..199e5833 100644 --- a/msgraph/models.go +++ b/msgraph/models.go @@ -20,6 +20,11 @@ type AccessPackage struct { DisplayName *string `json:"displayName,omitempty"` IsHidden *bool `json:"isHidden,omitempty"` ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` + //Beta + IsRoleScopesVisible *bool `json:"isRoleScopesVisible,omitempty"` + ModifiedBy *string `json:"modifiedBy,omitempty"` + CatalogId *string `json:"catalogId,omitempty"` + CreatedBy *string `json:"createdBy,omitempty"` } type AccessPackageAssignmentPolicy struct { @@ -49,6 +54,10 @@ type AccessPackageCatalog struct { DisplayName *string `json:"displayName,omitempty"` IsExternallyVisible *bool `json:"isExternallyVisible,omitempty"` ModifiedDateTime *time.Time `json:"modifiedDateTime,omitempty"` + //Beta + CatalogStatus AccessPackageCatalogStatus `json:"catalogStatus,omitempty"` + CreatedBy *string `json:"createdBy,omitempty"` + ModifiedBy *string `json:"modifiedBy,omitempty"` } type AccessPackageLocalizedContent struct { diff --git a/msgraph/valuetypes.go b/msgraph/valuetypes.go index dfe30a82..72799e03 100644 --- a/msgraph/valuetypes.go +++ b/msgraph/valuetypes.go @@ -29,6 +29,13 @@ const ( AccessPackageCatalogStateUnpublished AccessPackageCatalogState = "unpublished" ) +type AccessPackageCatalogStatus = string + +const ( + AccessPackageCatalogStatusPublished AccessPackageCatalogStatus = "Published" + AccessPackageCatalogStatusUnpublished AccessPackageCatalogState = "Unpublished" +) + type AccessPackageCatalogType = string const ( diff --git a/odata/types.go b/odata/types.go index 94f4ab15..7cf3cb96 100644 --- a/odata/types.go +++ b/odata/types.go @@ -7,9 +7,9 @@ const ( ShortTypeAccessPackageAssignmentPolicy ShortType = "accessPackageAssignmentPolicy" ShortTypeAccessPackageCatalog ShortType = "accessPackageCatalog" ShortTypeAccessPackageResourceRequest ShortType = "accessPackageResourceRequest" - ShortTypeAccessPackageQuestion Type = "accessPackageQuestion" - ShortTypeAccessPackageTextInputQuestion Type = "accessPackageTextInputQuestion" - ShortTypeAccessPackageMultipleChoiceQuestion Type = "accessPackageMultipleChoiceQuestion" + ShortTypeAccessPackageQuestion ShortType = "accessPackageQuestion" + ShortTypeAccessPackageTextInputQuestion ShortType = "accessPackageTextInputQuestion" + ShortTypeAccessPackageMultipleChoiceQuestion ShortType = "accessPackageMultipleChoiceQuestion" ShortTypeAdministrativeUnit ShortType = "administrativeUnit" ShortTypeApplication ShortType = "application" ShortTypeConditionalAccessPolicy ShortType = "conditionalAccessPolicy" @@ -45,8 +45,8 @@ const ( TypeAccessPackage Type = "#microsoft.graph.accessPackage" TypeAccessPackageAssignmentPolicy Type = "#microsoft.graph.accessPackageAssignmentPolicy" TypeAccessPackageQuestion Type = "#microsoft.graph.accessPackageQuestion" - TypeAccessPackageTextInputQuestion Type = "#microsoft.graph.accessPackageTextInputQuestion" - TypeAccessPackageMultipleChoiceQuestion Type = "#microsoft.graph.accessPackageMultipleChoiceQuestion" + TypeAccessPackageTextInputQuestion Type = "#microsoft.graph.accessPackageTextInputQuestion" + TypeAccessPackageMultipleChoiceQuestion Type = "#microsoft.graph.accessPackageMultipleChoiceQuestion" TypeAccessPackageCatalog Type = "#microsoft.graph.accessPackageCatalog" TypeAccessPackageResourceRequest Type = "#microsoft.graph.accessPackageResourceRequest" TypeAdministrativeUnit Type = "#microsoft.graph.administrativeUnit" From 5b110932da881d1de9e4347af057c9bd5edaccf7 Mon Sep 17 00:00:00 2001 From: kaovd Date: Thu, 23 Dec 2021 15:07:59 +0000 Subject: [PATCH 5/9] Add ReviewSettings tests, additional model fixes and valuetypes --- msgraph/accesspackageassignmentpolicy_test.go | 29 +++++++++++++++++-- msgraph/models.go | 26 ++++++++++------- msgraph/valuetypes.go | 25 ++++++++++++++++ odata/types.go | 4 +++ 4 files changed, 71 insertions(+), 13 deletions(-) diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go index b4e47cea..dfcebb29 100644 --- a/msgraph/accesspackageassignmentpolicy_test.go +++ b/msgraph/accesspackageassignmentpolicy_test.go @@ -3,6 +3,7 @@ package msgraph_test import ( "fmt" "testing" + "time" "github.com/manicminer/hamilton/internal/test" "github.com/manicminer/hamilton/internal/utils" @@ -20,11 +21,35 @@ func TestAccessPackageAssignmentPolicyClient(t *testing.T) { // Create AP accessPackage := testAccessPackage_Create(t, c, accessPackageCatalog) + currentTimePlusDay := time.Now().AddDate(0, 0, 1) + // Create Assignment Policy accessPackageAssignmentPolicy := testAccessPackageAssignmentPolicyClient_Create(t, c, msgraph.AccessPackageAssignmentPolicy{ AccessPackageId: accessPackage.ID, - DisplayName: utils.StringPtr(fmt.Sprintf("Test-AP-Policy-Assignment-%s", c.RandomString)), - Description: utils.StringPtr("Test AP Policy Assignment Description"), + AccessReviewSettings: &msgraph.AssignmentReviewSettings{ + AccessReviewTimeoutBehavior: msgraph.AccessReviewTimeoutBehaviorTypeRemoveAccess, + IsEnabled: utils.BoolPtr(true), + StartDateTime: ¤tTimePlusDay, + DurationInDays: utils.Int32Ptr(5), + RecurrenceType: msgraph.AccessReviewRecurranceTypeMonthly, + ReviewerType: msgraph.AccessReviewReviewerTypeSelf, + IsAccessRecommendationEnabled: utils.BoolPtr(true), + IsApprovalJustificationRequired: utils.BoolPtr(true), + // Reviewers: &[]msgraph.UserSet{ + // { + // ODataType: utils.StringPtr(odata.TypeRequestorManager), + // IsBackup: utils.BoolPtr(false), + // ManagerLevel: utils.Int32Ptr(1), + // }, + // { + // ODataType: utils.StringPtr(odata.TypeSingleUser), + // IsBackup: utils.BoolPtr(true), + // ID: utils.StringPtr(""), + // }, + // }, + }, + DisplayName: utils.StringPtr(fmt.Sprintf("Test-AP-Policy-Assignment-%s", c.RandomString)), + Description: utils.StringPtr("Test AP Policy Assignment Description"), //AccessReviewSettings: utils.BoolPtr() RequestorSettings: &msgraph.RequestorSettings{ //ScopeType: msgraph.RequestorSettingsScopeTypeSpecificDirectorySubjects, diff --git a/msgraph/models.go b/msgraph/models.go index 199e5833..ca69ca75 100644 --- a/msgraph/models.go +++ b/msgraph/models.go @@ -98,7 +98,7 @@ type AccessPackageResource struct { OriginSystem AccessPackageResourceOriginSystem `json:"originSystem,omitempty"` ResourceType *AccessPackageResourceType `json:"resourceType,omitempty"` Url *string `json:"url,omitempty"` - // Attributes is a returned collection but is not documented or used + // Attributes is a returned collection but is not documented or used in beta } type AccessPackageResourceEnvironment struct { @@ -514,12 +514,15 @@ type ApprovalStage struct { } type AssignmentReviewSettings struct { - IsEnabled *bool `json:"isEnabled,omitempty"` - RecurrenceType *string `json:"recurrenceType,omitempty"` - ReviewerType *string `json:"reviewerType,omitempty"` - StartDateTime *time.Time `json:"startDateTime,omitempty"` - DurationInDays *int32 `json:"durationInDays,omitempty"` - Reviewers *[]UserSet `json:"reviewers,omitempty"` + IsEnabled *bool `json:"isEnabled,omitempty"` + RecurrenceType AccessReviewRecurranceType `json:"recurrenceType,omitempty"` + ReviewerType AccessReviewReviewerType `json:"reviewerType,omitempty"` + StartDateTime *time.Time `json:"startDateTime,omitempty"` + DurationInDays *int32 `json:"durationInDays,omitempty"` + Reviewers *[]UserSet `json:"reviewers,omitempty"` + IsAccessRecommendationEnabled *bool `json:"isAccessRecommendationEnabled,omitempty"` + IsApprovalJustificationRequired *bool `json:"isApprovalJustificationRequired,omitempty"` + AccessReviewTimeoutBehavior AccessReviewTimeoutBehaviorType `json:"accessReviewTimeoutBehavior,omitempty"` } type AuditActivityInitiator struct { @@ -1510,10 +1513,11 @@ type UserRegistrationMethodSummary struct { } type UserSet struct { - ODataType *odata.Type `json:"@odata.type,omitempty"` - IsBackup *bool `json:"isBackup,omitempty"` - ID *string `json:"id,omitempty"` // Either user or group ID - Description *string `json:"description,omitempty"` + ODataType *odata.Type `json:"@odata.type,omitempty"` + IsBackup *bool `json:"isBackup,omitempty"` + ID *string `json:"id,omitempty"` // Either user or group ID + Description *string `json:"description,omitempty"` + ManagerLevel *int32 `json:"managerLevel,omitempty"` } type UserCredentialUsageDetails struct { diff --git a/msgraph/valuetypes.go b/msgraph/valuetypes.go index 72799e03..b6a91027 100644 --- a/msgraph/valuetypes.go +++ b/msgraph/valuetypes.go @@ -71,6 +71,31 @@ const ( AccessPackageResourceTypeSharePointOnlineSite AccessPackageResourceType = "SharePoint Online Site" ) +type AccessReviewTimeoutBehaviorType = string + +const ( + AccessReviewTimeoutBehaviorTypeAcceptAccessRecommendation AccessReviewTimeoutBehaviorType = "acceptAccessRecommendation" + AccessReviewTimeoutBehaviorTypeKeepAccess AccessReviewTimeoutBehaviorType = "keepAccess" + AccessReviewTimeoutBehaviorTypeRemoveAccess AccessReviewTimeoutBehaviorType = "removeAccess" +) + +type AccessReviewReviewerType = string + +const ( + AccessReviewReviewerTypeSelf AccessReviewReviewerType = "Self" + AccessReviewReviewerTypeReviewers AccessReviewReviewerType = "Reviewers" +) + +type AccessReviewRecurranceType = string + +const ( + AccessReviewRecurranceTypeWeekly AccessReviewRecurranceType = "weekly" + AccessReviewRecurranceTypeMonthly AccessReviewRecurranceType = "monthly" + AccessReviewRecurranceTypeQuarterly AccessReviewRecurranceType = "quarterly" + AccessReviewRecurranceTypeHalfYearly AccessReviewRecurranceType = "halfyearly" + AccessReviewRecurranceTypeAnnual AccessReviewRecurranceType = "annual" +) + type AdministrativeUnitVisibility = string const ( diff --git a/odata/types.go b/odata/types.go index 7cf3cb96..08160e3c 100644 --- a/odata/types.go +++ b/odata/types.go @@ -21,6 +21,7 @@ const ( ShortTypeDirectoryRoleTemplate ShortType = "directoryRoleTemplate" ShortTypeDomain ShortType = "domain" ShortTypeEmailAuthenticationMethod ShortType = "emailAuthenticationMethod" + ShortTypeExternalSponsors ShortType = "externalSponsors" ShortTypeFido2AuthenticationMethod ShortType = "fido2AuthenticationMethod" ShortTypeGroup ShortType = "group" ShortTypeGroupMembers ShortType = "groupMembers" @@ -31,6 +32,7 @@ const ( ShortTypeOrganization ShortType = "organization" ShortTypePasswordAuthenticationMethod ShortType = "passwordAuthenticationMethod" ShortTypePhoneAuthenticationMethod ShortType = "phoneAuthenticationMethod" + ShortTypeRequestorManager ShortType = "requestorManager" ShortTypeServicePrincipal ShortType = "servicePrincipal" ShortTypeSingleUser ShortType = "singleUser" ShortTypeSocialIdentityProvider ShortType = "socialIdentityProvider" @@ -60,6 +62,7 @@ const ( TypeDirectoryRoleTemplate Type = "#microsoft.graph.directoryRoleTemplate" TypeDomain Type = "#microsoft.graph.domain" TypeEmailAuthenticationMethod Type = "#microsoft.graph.emailAuthenticationMethod" + TypeExternalSponsors Type = "#microsoft.graph.externalSponsors" TypeFido2AuthenticationMethod Type = "#microsoft.graph.fido2AuthenticationMethod" TypeGroup Type = "#microsoft.graph.group" TypeGroupMembers Type = "#microsoft.graph.groupMembers" @@ -70,6 +73,7 @@ const ( TypeOrganization Type = "#microsoft.graph.organization" TypePasswordAuthenticationMethod Type = "#microsoft.graph.passwordAuthenticationMethod" TypePhoneAuthenticationMethod Type = "#microsoft.graph.phoneAuthenticationMethod" + TypeRequestorManager Type = "#microsoft.graph.requestorManager" TypeServicePrincipal Type = "#microsoft.graph.servicePrincipal" TypeSingleUser Type = "#microsoft.graph.singleUser" TypeSocialIdentityProvider Type = "#microsoft.graph.socialIdentityProvider" From cea8ef1767e4cf826bc81099d31b81ece990a03a Mon Sep 17 00:00:00 2001 From: kaovd Date: Thu, 6 Jan 2022 09:56:27 +0000 Subject: [PATCH 6/9] Fix value types - Force workflow rerun --- go.mod | 2 +- msgraph/accesspackage_test.go | 2 +- msgraph/accesspackageassignmentpolicy_test.go | 2 +- msgraph/accesspackagecatalog_test.go | 2 +- msgraph/accesspackageresourcerequest_test.go | 4 ++-- msgraph/accesspackageresourcerolescope_test.go | 4 ++-- msgraph/valuetypes.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 2153122a..ca5d4bcc 100644 --- a/go.mod +++ b/go.mod @@ -14,4 +14,4 @@ require ( golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c google.golang.org/appengine v1.6.7 // indirect -) +) \ No newline at end of file diff --git a/msgraph/accesspackage_test.go b/msgraph/accesspackage_test.go index 2a1cd55a..5735690b 100644 --- a/msgraph/accesspackage_test.go +++ b/msgraph/accesspackage_test.go @@ -56,7 +56,7 @@ func testAccessPackageClient_Create(t *testing.T, c *test.Test, a msgraph.Access t.Fatal("AccessPackageClient.Create(): accessPackage was nil") } if accessPackage.ID == nil { - t.Fatal("AccessPackageClient.Create(): acccessPackage.ID was nil") + t.Fatal("AccessPackageClient.Create(): accessPackage.ID was nil") } return } diff --git a/msgraph/accesspackageassignmentpolicy_test.go b/msgraph/accesspackageassignmentpolicy_test.go index dfcebb29..3cabcf75 100644 --- a/msgraph/accesspackageassignmentpolicy_test.go +++ b/msgraph/accesspackageassignmentpolicy_test.go @@ -169,7 +169,7 @@ func testAccessPackageAssignmentPolicyClient_Create(t *testing.T, c *test.Test, t.Fatal("AccessPackageAssignmentPolicyClient.Create(): accessPackageAssignmentPolicy was nil") } if accessPackageAssignmentPolicy.ID == nil { - t.Fatal("AccessPackageAssignmentPolicyClient.Create(): acccessPackageAssignmentPolicy.ID was nil") + t.Fatal("AccessPackageAssignmentPolicyClient.Create(): accessPackageAssignmentPolicy.ID was nil") } return } diff --git a/msgraph/accesspackagecatalog_test.go b/msgraph/accesspackagecatalog_test.go index 1556a818..8c5a139c 100644 --- a/msgraph/accesspackagecatalog_test.go +++ b/msgraph/accesspackagecatalog_test.go @@ -45,7 +45,7 @@ func testAccessPackageCatalogClient_Create(t *testing.T, c *test.Test, a msgraph t.Fatal("AccessPackageCatalogClient.Create(): accessPackageCatalog was nil") } if accessPackageCatalog.ID == nil { - t.Fatal("AccessPackageCatalogClient.Create(): acccessPackageCatalog.ID was nil") + t.Fatal("AccessPackageCatalogClient.Create(): accessPackageCatalog.ID was nil") } return } diff --git a/msgraph/accesspackageresourcerequest_test.go b/msgraph/accesspackageresourcerequest_test.go index 9df4c4c9..d81bbf6a 100644 --- a/msgraph/accesspackageresourcerequest_test.go +++ b/msgraph/accesspackageresourcerequest_test.go @@ -71,7 +71,7 @@ func testAccessPackageResourceRequestClient_Create(t *testing.T, c *test.Test, a t.Fatal("AccessPackageResourceRequestClient.Create(): accessPackageResourceRequest was nil") } if accessPackageResourceRequest.ID == nil { - t.Fatal("AccessPackageResourceRequestClient.Create(): acccessPackageResourceRequest.ID was nil") + t.Fatal("AccessPackageResourceRequestClient.Create(): accessPackageResourceRequest.ID was nil") } return } @@ -125,7 +125,7 @@ func testAccessPackageResourceRequestAP_Create(t *testing.T, c *test.Test, a msg t.Fatal("AccessPackageClient.Create(): accessPackage was nil") } if accessPackage.ID == nil { - t.Fatal("AccessPackageClient.Create(): acccessPackage.ID was nil") + t.Fatal("AccessPackageClient.Create(): accessPackage.ID was nil") } return } diff --git a/msgraph/accesspackageresourcerolescope_test.go b/msgraph/accesspackageresourcerolescope_test.go index fded0253..86bf6d75 100644 --- a/msgraph/accesspackageresourcerolescope_test.go +++ b/msgraph/accesspackageresourcerolescope_test.go @@ -161,7 +161,7 @@ func testAccessPackageResourceRoleScopeResourceRequest_Create(t *testing.T, c *t t.Fatal("AccessPackageResourceRequestClient.Create(): accessPackageResourceRequest was nil") } if accessPackageResourceRequest.ID == nil { - t.Fatal("AccessPackageResourceRequestClient.Create(): acccessPackageResourceRequest.ID was nil") + t.Fatal("AccessPackageResourceRequestClient.Create(): accessPackageResourceRequest.ID was nil") } return } @@ -190,7 +190,7 @@ func testAccessPackageResourceRoleScopeAP_Create(t *testing.T, c *test.Test, a m t.Fatal("AccessPackageClient.Create(): accessPackage was nil") } if accessPackage.ID == nil { - t.Fatal("AccessPackageClient.Create(): acccessPackage.ID was nil") + t.Fatal("AccessPackageClient.Create(): accessPackage.ID was nil") } return } diff --git a/msgraph/valuetypes.go b/msgraph/valuetypes.go index b6a91027..9c70e8bf 100644 --- a/msgraph/valuetypes.go +++ b/msgraph/valuetypes.go @@ -61,7 +61,7 @@ type AccessPackageResourceRequestType = string const ( AccessPackageResourceRequestTypeAdminAdd AccessPackageResourceRequestType = "AdminAdd" - AccessPackageResourceRequestTypeAdmminRemove AccessPackageResourceRequestType = "AdminRemove" + AccessPackageResourceRequestTypeAdminRemove AccessPackageResourceRequestType = "AdminRemove" ) type AccessPackageResourceType = string From 56e14ab38fc814b0ce1cf742f008e0f25f5b19ed Mon Sep 17 00:00:00 2001 From: kaovd Date: Thu, 6 Jan 2022 09:57:00 +0000 Subject: [PATCH 7/9] Readd --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ca5d4bcc..2153122a 100644 --- a/go.mod +++ b/go.mod @@ -14,4 +14,4 @@ require ( golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c google.golang.org/appengine v1.6.7 // indirect -) \ No newline at end of file +) From fab839abb865d65f508553fec18d4b81a43d696e Mon Sep 17 00:00:00 2001 From: kaovd Date: Mon, 10 Jan 2022 11:46:54 +0000 Subject: [PATCH 8/9] Rerun tests From 10e3abea52432a7507995964dda0a01794adc6c8 Mon Sep 17 00:00:00 2001 From: kaovd Date: Wed, 12 Jan 2022 22:24:57 +0000 Subject: [PATCH 9/9] rerun tests