Skip to content

Entra ID reconciler: directory reconciler prerequisites #40778

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

Merged
justinas merged 4 commits into from
May 2, 2024
Merged

Entra ID reconciler: directory reconciler prerequisites #40778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb6c078
Add Entra ID resource origin
Apr 18, 2024
48abf21
Ignore ID and Revision from `header` in cmp
Apr 18, 2024
9de92d6
Add e_imports for MS Graph SDK
Apr 22, 2024
bd99853
Merge remote-tracking branch 'origin/master' into justinas/entra-id-r…
May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/types/common/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ const (
// OriginDiscoveryKubernetes indicates that the resource was imported
// from kubernetes cluster by discovery service.
OriginDiscoveryKubernetes = "discovery-kubernetes"

// OriginEntraID indicates that the resource was imported
// from the Entra ID directory.
OriginEntraID = "entra-id"
)

// OriginValues lists all possible origin values.
Expand All @@ -72,4 +76,5 @@ var OriginValues = []string{
OriginKubernetes,
OriginOkta,
OriginDiscoveryKubernetes,
OriginEntraID,
}
4 changes: 4 additions & 0 deletions api/types/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,10 @@ const (
// from kubernetes cluster by discovery service.
OriginDiscoveryKubernetes = common.OriginDiscoveryKubernetes

// OriginEntraID indicates that the resource was imported
// from the Entra ID directory.
OriginEntraID = common.OriginEntraID

// IntegrationLabel is a resource metadata label name used to identify the integration name that created the resource.
IntegrationLabel = TeleportNamespace + "/integration"

Expand Down
1 change: 1 addition & 0 deletions e_imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ import (
_ "github.com/mailgun/holster/v3/clock"
_ "github.com/microsoft/kiota-authentication-azure-go"
_ "github.com/microsoftgraph/msgraph-sdk-go"
_ "github.com/microsoftgraph/msgraph-sdk-go-core"
_ "github.com/mitchellh/mapstructure"
_ "github.com/okta/okta-sdk-golang/v2/okta"
_ "github.com/okta/okta-sdk-golang/v2/okta/query"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ require (
github.com/mdlayher/netlink v1.7.2
github.com/microsoft/go-mssqldb v0.0.0-00010101000000-000000000000 // replaced
github.com/microsoft/kiota-authentication-azure-go v1.0.2
github.com/microsoftgraph/msgraph-sdk-go v1.37.0
github.com/microsoftgraph/msgraph-sdk-go v1.38.0
github.com/microsoftgraph/msgraph-sdk-go-core v1.1.0
github.com/miekg/pkcs11 v1.1.1
github.com/mitchellh/mapstructure v1.5.0
github.com/moby/term v0.5.0
Expand Down Expand Up @@ -426,7 +427,6 @@ require (
github.com/microsoft/kiota-serialization-json-go v1.0.7 // indirect
github.com/microsoft/kiota-serialization-multipart-go v1.0.0 // indirect
github.com/microsoft/kiota-serialization-text-go v1.0.0 // indirect
github.com/microsoftgraph/msgraph-sdk-go-core v1.1.0 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,8 +1868,8 @@ github.com/microsoft/kiota-serialization-multipart-go v1.0.0 h1:3O5sb5Zj+moLBiJy
github.com/microsoft/kiota-serialization-multipart-go v1.0.0/go.mod h1:yauLeBTpANk4L03XD985akNysG24SnRJGaveZf+p4so=
github.com/microsoft/kiota-serialization-text-go v1.0.0 h1:XOaRhAXy+g8ZVpcq7x7a0jlETWnWrEum0RhmbYrTFnA=
github.com/microsoft/kiota-serialization-text-go v1.0.0/go.mod h1:sM1/C6ecnQ7IquQOGUrUldaO5wj+9+v7G2W3sQ3fy6M=
github.com/microsoftgraph/msgraph-sdk-go v1.37.0 h1:wD62FzIBu4gVg70ikAm7D45tFqvDKo+K6aJ+zeNWlAE=
github.com/microsoftgraph/msgraph-sdk-go v1.37.0/go.mod h1:xYBUc+4LGRjYRyTF4CLiKAqb981AhlSfvRX11is25q4=
github.com/microsoftgraph/msgraph-sdk-go v1.38.0 h1:pxVMih65Iul2yIUVE5PUqdw5Q4eFuH+eb4ZTxR3oGag=
github.com/microsoftgraph/msgraph-sdk-go v1.38.0/go.mod h1:u/ciVhK5eBqzQvsVnTVdeEl+Jgy9WbUoUHHKgcw54hk=
github.com/microsoftgraph/msgraph-sdk-go-core v1.1.0 h1:NB7c/n4Knj+TLaLfjsahhSqoUqoN/CtyNB0XIe/nJnM=
github.com/microsoftgraph/msgraph-sdk-go-core v1.1.0/go.mod h1:M3w/5IFJ1u/DpwOyjsjNSVEA43y1rLOeX58suyfBhGk=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
Expand Down
2 changes: 2 additions & 0 deletions lib/services/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/api/types/accesslist"
"github.com/gravitational/teleport/api/types/compare"
"github.com/gravitational/teleport/api/types/header"
)

// CompareResources compares two resources by all significant fields.
Expand All @@ -42,6 +43,7 @@ func CompareResources[T any](resA, resB T) int {
cmpopts.IgnoreFields(types.DatabaseV3{}, "Status"),
cmpopts.IgnoreFields(types.UserSpecV2{}, "Status"),
cmpopts.IgnoreFields(accesslist.AccessList{}, "Status"),
cmpopts.IgnoreFields(header.Metadata{}, "ID", "Revision"),
cmpopts.IgnoreUnexported(headerv1.Metadata{}),
// Managed by IneligibleStatusReconciler, ignored by all others.
cmpopts.IgnoreFields(accesslist.AccessListMemberSpec{}, "IneligibleStatus"),
Expand Down