Merge branch 'main' into feature-accesspackageresourcerole

Author: manicminer

.github/workflows/golint.yaml

@@ -0,0 +1,24 @@
+---
+name: GoLang Linting
+on:
+  pull_request:
+    types: ["opened", "synchronize"]
+    paths:
+      - "**.go"
+      - ".github/workflows/golint.yml"
+
+jobs:
+  golint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: ./.go-version
+
+      - uses: golangci/golangci-lint-action@v4
+        with:
+          version: 'v1.57.1'
+
+# vim: set ts=2 sts=2 sw=2 et:

.github/workflows/golint.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - "msgraph/**.go"
       - ".github/workflows/msgraph-tests.yml"
+  workflow_dispatch:
 
 permissions:
   contents: 'read'
@@ -15,14 +16,11 @@ jobs:
   test-msgraph:
     runs-on: self-hosted
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - id: go-version
-        run: echo "go_version=$(cat .go-version)" >>$GITHUB_OUTPUT
-
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: '${{ steps.go-version.outputs.go_version }}'
+          go-version-file: ./.go-version
 
       - run: go test -count=1 -race -v ./msgraph
 #        env:

.github/workflows/msgraph-tests.yml .github/workflows/msgraph-tests.yaml.github/workflows/msgraph-tests.yml renamed to .github/workflows/msgraph-tests.yaml

@@ -3,21 +3,19 @@ name: Scheduled cleanup
 on:
   schedule:
     - cron: "58 */6 * * *"
+  workflow_dispatch:
 
 jobs:
   cleanup:
     runs-on: self-hosted
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - id: go-version
-        run: echo "go_version=$(cat .go-version)" >>$GITHUB_OUTPUT
-
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: '${{ steps.go-version.outputs.go_version }}'
+          go-version-file: ./.go-version
 
       - run: go run ./internal/cmd/test-cleanup
 

.github/workflows/scheduled-cleanup.yml .github/workflows/scheduled-cleanup.yaml.github/workflows/scheduled-cleanup.yml renamed to .github/workflows/scheduled-cleanup.yaml

@@ -1 +1 @@
-1.19.2
+1.22.1

.go-version

@@ -1,3 +1,15 @@
+## v0.67.0 (Unreleased)
+
+- Support for PIM Role Management [Policies](https://learn.microsoft.com/en-us/graph/api/resources/unifiedrolemanagementpolicy?view=graph-rest-1.0), [Rules](https://learn.microsoft.com/en-us/graph/api/resources/unifiedrolemanagementpolicyrule?view=graph-rest-1.0), and [Assignments](https://learn.microsoft.com/en-us/graph/api/resources/unifiedrolemanagementpolicyassignment?view=graph-rest-1.0) ([#277](https://github.com/manicminer/hamilton/pull/277))
+- Support for PIM Group Eligibility [Schedules](https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityschedule?view=graph-rest-1.0), [Instances](https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityscheduleinstance?view=graph-rest-1.0), and [Requests](https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityschedulerequest?view=graph-rest-1.0) ([#277](https://github.com/manicminer/hamilton/pull/277))
+- Support for PIM Group Assignment [Schedules]([https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityschedule?view=graph-rest-1.0](https://learn.microsoft.com/en-us/graph/api/resources/privilegedaccessgroupassignmentschedule?view=graph-rest-1.0)), [Instances]([https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityscheduleinstance?view=graph-rest-1.0](https://learn.microsoft.com/en-us/graph/api/resources/privilegedaccessgroupassignmentscheduleinstance?view=graph-rest-1.0)), and [Requests]([https://learn.microsoft.com/en-us/graph/api/resources/unifiedroleeligibilityschedulerequest?view=graph-rest-1.0](https://learn.microsoft.com/en-us/graph/api/resources/privilegedaccessgroupassignmentschedulerequest?view=graph-rest-1.0)) ([#277](https://github.com/manicminer/hamilton/pull/277))
+- Support for the `ApplicationFilter` field in the `ConditionalAccessApplications` model ([#268](https://github.com/manicminer/hamilton/pull/268))
+- Added `SkipExchangeInstantOn` to supported `msgraph.GroupResourceBehaviorOption` values ([#275](https://github.com/manicminer/hamilton/pull/275))
+
+⚠️ BREAKING CHANGES:
+
+- `ExpirationPatternDuration` has changed from a `*time.Duration` to a `*string` ([#276](https://github.com/manicminer/hamilton/pull/277))
+
 ## v0.66.0 (January 25, 2024)
 
 - This is a maintenance release to update to the latest published module for `github.com/hashicorp/go-azure-sdk/sdk` ([#272](https://github.com/manicminer/hamilton/pull/272))

CHANGELOG.md

@@ -18,7 +18,7 @@ test:
 tools:
 	@echo "==> installing required tooling..."
 	go install mvdan.cc/gofumpt@latest
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$$(go env GOPATH || $$GOPATH)"/bin v1.50.0
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$$(go env GOPATH || $$GOPATH)"/bin v1.57.1
 
 todo:
 	grep --color=always --exclude=GNUmakefile --exclude-dir=.git --exclude-dir=vendor --recursive TODO "$(CURDIR)"

GNUmakefile

@@ -131,22 +131,74 @@ Please raise a pull request [on GitHub][gh-project] to submit contributions. Bug
 
 ## Testing
 
-Testing requires an Azure AD tenant and real credentials. Note that some tests require an Azure AD Premium P2 license and/or an Office 365 license.
-You can authenticate with any supported method for the client tests, and the auth tests are split by authentication method.
+Testing requires at least one Azure AD tenant and real credentials.
+
+Note that running all tests requires three separate tenants, and that some tests require an Azure AD Premium P2 license and/or an Office 365 license.
+
+> ℹ️ You can sign up for the [Microsoft 365 Developer Program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) which offers a Microsoft 365 E5 subscription for 25 users, at no cost for development purposes. That will suffice for most tests.
 
-> ℹ️ You can sign up for the [Microsoft 365 Developer Program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) which offers a Microsoft 365 E5 subscription for 25 users, at no cost for development purposes.
+It's recommended to use an isolated tenant for testing and _not_ a production tenant.
+
+You can authenticate with any supported method for the client tests, and the auth tests are split by authentication method.
 
 Note that each client generally has a single test that exercises all methods. This is to help ensure that test objects
 are cleaned up where possible. Where tests fail, often objects will be left behind and should be cleaned up separately.
 The [test-cleanup](https://github.com/manicminer/hamilton/tree/main/internal/cmd/test-cleanup) command can be used to
 delete leftover test objects in the event of test failure.
 
-It's recommended to use an isolated tenant for testing and _not_ a production tenant.
+### Configuring single-tenant tests (eg. with a no-cost subscription from Microsoft 365 Developer Program)
+To set up environment variables:
+```shell
+az login --allow-no-subscriptions
+
+# create one in the Azure Portal -> Entra ID -> App registrations -> New Registration
+# set "hamilton" as name, accept other defaults. Then copy Essentials -> Application (client) ID
+export CLIENT_ID=...
+# find this on the Azure Portal -> Entra ID -> Basic Information -> Tenant ID
+export TENANT_ID=...
+# find this on the Azure Portal -> Entra ID -> Basic Information -> Primary domain
+export TENANT_DOMAIN=...
+
+export DEFAULT_TENANT_ID=${TENANT_ID}
+export DEFAULT_TENANT_DOMAIN=${TENANT_DOMAIN}
+export CONNECTED_TENANT_ID=${TENANT_ID}
+export CONNECTED_TENANT_DOMAIN=${TENANT_DOMAIN}
+export B2C_TENANT_ID=${TENANT_ID}
+export B2C_TENANT_DOMAIN=${TENANT_DOMAIN}
+```
+
+To run one test (eg. `TestUsersClient`):
+```shell
+go test --race '-run=^TestUsersClient$' ./...
+```
+
+
+### Configuring and running all tests
+To set up environment variables:
+```shell
+az login
+
+# find this on the Azure Portal -> Entra ID -> Basic Information -> Tenant ID
+export DEFAULT_TENANT_ID=...
+# find this on the Azure Portal -> Entra ID -> Basic Information -> Primary domain
+export DEFAULT_TENANT_DOMAIN=...
+
+# same as above, but from a separate tenant, to run TestConnectedOrganizationClient
+export CONNECTED_TENANT_ID=...
+export CONNECTED_TENANT_DOMAIN=${TENANT_DOMAIN}
+
+# same as above, but from yet another separate tenant, to run TestB2CUserFlowClient
+export B2C_TENANT_ID=${TENANT_ID}
+export B2C_TENANT_DOMAIN=${TENANT_DOMAIN}
+```
+
+> ℹ️ View all supported environment variables in the [`envDefault()` testing helper function](https://github.com/manicminer/hamilton/blob/main/internal/test/testing.go).
 
 To run all the tests:
 ```shell
 $ make test
 ```
 
+
 [gh-project]: https://github.com/manicminer/hamilton
 [ms-graph-docs]: https://docs.microsoft.com/en-us/graph/overview

README.md

@@ -5,16 +5,18 @@ import (
 	"time"
 )
 
+var source *rand.Rand
+
 func init() {
-	rand.Seed(time.Now().UnixNano())
+	source = rand.New(rand.NewSource(time.Now().UnixNano()))
 }
 
 // RandomString returns a random alphanumeric string useful for testing purposes.
 func RandomString() string {
 	chars := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 	s := make([]rune, 8)
 	for i := range s {
-		s[i] = chars[rand.Intn(len(chars))]
+		s[i] = chars[source.Intn(len(chars))]
 	}
 	return string(s)
 }