From bf9bf2ace77023efb4e122cce6a26c3b0d857609 Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Thu, 18 Apr 2024 02:16:45 +0300 Subject: [PATCH] Adjust example manifests for converting singleton lists to embedded objects - Fix the example manifest examples/directoryroles/v1beta1/customdirectoryrole.yaml Signed-off-by: Alper Rifat Ulucinar --- .../{ => v1beta1}/member.yaml | 0 .../{ => v1beta1}/unit.yaml | 0 .../app/{ => v1beta1}/roleassignment.yaml | 0 .../{ => v1beta1}/application.yaml | 0 .../{ => v1beta1}/certificate.yaml | 0 .../federatedidentitycredential.yaml | 0 .../applications/{ => v1beta1}/password.yaml | 0 .../{ => v1beta1}/preauthorized.yaml | 0 .../applications/v1beta2/application.yaml | 15 +++++ .../v1beta1/accesspolicy.yaml | 55 +++++++++++++++++++ .../conditionalaccess/v1beta2/location.yaml | 20 +++++++ .../{ => v1beta1}/customdirectoryrole.yaml | 1 - .../directoryroles/{ => v1beta1}/role.yaml | 0 .../{ => v1beta1}/roleassignment.yaml | 0 examples/groups/{ => v1beta1}/group.yaml | 0 examples/groups/{ => v1beta1}/member.yaml | 2 +- examples/groups/v1beta2/group.yaml | 16 ++++++ .../invitations/{ => v1beta1}/invitation.yaml | 0 examples/invitations/v1beta2/invitation.yaml | 19 +++++++ .../{ => v1beta1}/claimsmappingpolicy.yaml | 0 .../{ => v1beta1}/permissiongrant.yaml | 4 +- .../{ => v1beta1}/certificate.yaml | 0 .../claimsmappingpolicyassignment.yaml | 0 .../{ => v1beta1}/password.yaml | 0 .../{ => v1beta1}/principal.yaml | 0 .../tokensigningcertificate.yaml | 0 .../serviceprincipals/v1beta2/principal.yaml | 30 ++++++++++ .../synchronization/{ => v1beta1}/job.yaml | 2 +- .../synchronization/{ => v1beta1}/secret.yaml | 2 +- examples/users/{ => v1beta1}/user.yaml | 0 30 files changed, 160 insertions(+), 6 deletions(-) rename examples/administrativeunits/{ => v1beta1}/member.yaml (100%) rename examples/administrativeunits/{ => v1beta1}/unit.yaml (100%) rename examples/app/{ => v1beta1}/roleassignment.yaml (100%) rename examples/applications/{ => v1beta1}/application.yaml (100%) rename examples/applications/{ => v1beta1}/certificate.yaml (100%) rename examples/applications/{ => v1beta1}/federatedidentitycredential.yaml (100%) rename examples/applications/{ => v1beta1}/password.yaml (100%) rename examples/applications/{ => v1beta1}/preauthorized.yaml (100%) create mode 100644 examples/applications/v1beta2/application.yaml create mode 100644 examples/conditionalaccess/v1beta1/accesspolicy.yaml create mode 100644 examples/conditionalaccess/v1beta2/location.yaml rename examples/directoryroles/{ => v1beta1}/customdirectoryrole.yaml (94%) rename examples/directoryroles/{ => v1beta1}/role.yaml (100%) rename examples/directoryroles/{ => v1beta1}/roleassignment.yaml (100%) rename examples/groups/{ => v1beta1}/group.yaml (100%) rename examples/groups/{ => v1beta1}/member.yaml (95%) create mode 100644 examples/groups/v1beta2/group.yaml rename examples/invitations/{ => v1beta1}/invitation.yaml (100%) create mode 100644 examples/invitations/v1beta2/invitation.yaml rename examples/policies/{ => v1beta1}/claimsmappingpolicy.yaml (100%) rename examples/serviceprincipaldelegated/{ => v1beta1}/permissiongrant.yaml (94%) rename examples/serviceprincipals/{ => v1beta1}/certificate.yaml (100%) rename examples/serviceprincipals/{ => v1beta1}/claimsmappingpolicyassignment.yaml (100%) rename examples/serviceprincipals/{ => v1beta1}/password.yaml (100%) rename examples/serviceprincipals/{ => v1beta1}/principal.yaml (100%) rename examples/serviceprincipals/{ => v1beta1}/tokensigningcertificate.yaml (100%) create mode 100644 examples/serviceprincipals/v1beta2/principal.yaml rename examples/synchronization/{ => v1beta1}/job.yaml (97%) rename examples/synchronization/{ => v1beta1}/secret.yaml (96%) rename examples/users/{ => v1beta1}/user.yaml (100%) diff --git a/examples/administrativeunits/member.yaml b/examples/administrativeunits/v1beta1/member.yaml similarity index 100% rename from examples/administrativeunits/member.yaml rename to examples/administrativeunits/v1beta1/member.yaml diff --git a/examples/administrativeunits/unit.yaml b/examples/administrativeunits/v1beta1/unit.yaml similarity index 100% rename from examples/administrativeunits/unit.yaml rename to examples/administrativeunits/v1beta1/unit.yaml diff --git a/examples/app/roleassignment.yaml b/examples/app/v1beta1/roleassignment.yaml similarity index 100% rename from examples/app/roleassignment.yaml rename to examples/app/v1beta1/roleassignment.yaml diff --git a/examples/applications/application.yaml b/examples/applications/v1beta1/application.yaml similarity index 100% rename from examples/applications/application.yaml rename to examples/applications/v1beta1/application.yaml diff --git a/examples/applications/certificate.yaml b/examples/applications/v1beta1/certificate.yaml similarity index 100% rename from examples/applications/certificate.yaml rename to examples/applications/v1beta1/certificate.yaml diff --git a/examples/applications/federatedidentitycredential.yaml b/examples/applications/v1beta1/federatedidentitycredential.yaml similarity index 100% rename from examples/applications/federatedidentitycredential.yaml rename to examples/applications/v1beta1/federatedidentitycredential.yaml diff --git a/examples/applications/password.yaml b/examples/applications/v1beta1/password.yaml similarity index 100% rename from examples/applications/password.yaml rename to examples/applications/v1beta1/password.yaml diff --git a/examples/applications/preauthorized.yaml b/examples/applications/v1beta1/preauthorized.yaml similarity index 100% rename from examples/applications/preauthorized.yaml rename to examples/applications/v1beta1/preauthorized.yaml diff --git a/examples/applications/v1beta2/application.yaml b/examples/applications/v1beta2/application.yaml new file mode 100644 index 00000000..41f4e3ea --- /dev/null +++ b/examples/applications/v1beta2/application.yaml @@ -0,0 +1,15 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: applications.azuread.upbound.io/v1beta2 +kind: Application +metadata: + annotations: + meta.upbound.io/example-id: applications/v1beta1/application + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + displayName: example-${Rand.RFC1123Subdomain} diff --git a/examples/conditionalaccess/v1beta1/accesspolicy.yaml b/examples/conditionalaccess/v1beta1/accesspolicy.yaml new file mode 100644 index 00000000..647c4e36 --- /dev/null +++ b/examples/conditionalaccess/v1beta1/accesspolicy.yaml @@ -0,0 +1,55 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: conditionalaccess.azuread.upbound.io/v1beta1 +kind: AccessPolicy +metadata: + annotations: + meta.upbound.io/example-id: conditionalaccess/v1beta1/accesspolicy + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + conditions: + - applications: + - excludedApplications: [] + includedApplications: + - All + clientAppTypes: + - all + devices: + - filter: + - mode: exclude + rule: device.operatingSystem eq "Doors" + locations: + - excludedLocations: + - AllTrusted + includedLocations: + - All + platforms: + - excludedPlatforms: + - iOS + includedPlatforms: + - android + signInRiskLevels: + - medium + userRiskLevels: + - medium + users: + - excludedUsers: + - GuestsOrExternalUsers + includedUsers: + - All + displayName: example policy + grantControls: + - builtInControls: + - mfa + operator: OR + sessionControls: + - applicationEnforcedRestrictionsEnabled: true + cloudAppSecurityPolicy: monitorOnly + signInFrequency: 10 + signInFrequencyPeriod: hours + state: disabled diff --git a/examples/conditionalaccess/v1beta2/location.yaml b/examples/conditionalaccess/v1beta2/location.yaml new file mode 100644 index 00000000..61dcd12a --- /dev/null +++ b/examples/conditionalaccess/v1beta2/location.yaml @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: conditionalaccess.azuread.upbound.io/v1beta2 +kind: Location +metadata: + annotations: + meta.upbound.io/example-id: conditionalaccess/v1beta1/location + labels: + testing.upbound.io/example-name: example-ip + name: example-ip +spec: + forProvider: + displayName: IP Named Location + ip: + ipRanges: + - 1.1.1.1/32 + - 2.2.2.2/32 + trusted: true diff --git a/examples/directoryroles/customdirectoryrole.yaml b/examples/directoryroles/v1beta1/customdirectoryrole.yaml similarity index 94% rename from examples/directoryroles/customdirectoryrole.yaml rename to examples/directoryroles/v1beta1/customdirectoryrole.yaml index e0e03361..cb75a4fa 100644 --- a/examples/directoryroles/customdirectoryrole.yaml +++ b/examples/directoryroles/v1beta1/customdirectoryrole.yaml @@ -21,7 +21,6 @@ spec: - microsoft.directory/applications/create - microsoft.directory/applications/standard/read - allowedResourceActions: - - microsoft.directory/groups/allProperties/read - microsoft.directory/groups/allProperties/read - microsoft.directory/groups/basic/update - microsoft.directory/groups/create diff --git a/examples/directoryroles/role.yaml b/examples/directoryroles/v1beta1/role.yaml similarity index 100% rename from examples/directoryroles/role.yaml rename to examples/directoryroles/v1beta1/role.yaml diff --git a/examples/directoryroles/roleassignment.yaml b/examples/directoryroles/v1beta1/roleassignment.yaml similarity index 100% rename from examples/directoryroles/roleassignment.yaml rename to examples/directoryroles/v1beta1/roleassignment.yaml diff --git a/examples/groups/group.yaml b/examples/groups/v1beta1/group.yaml similarity index 100% rename from examples/groups/group.yaml rename to examples/groups/v1beta1/group.yaml diff --git a/examples/groups/member.yaml b/examples/groups/v1beta1/member.yaml similarity index 95% rename from examples/groups/member.yaml rename to examples/groups/v1beta1/member.yaml index ca3fc9d6..11a1fc87 100644 --- a/examples/groups/member.yaml +++ b/examples/groups/v1beta1/member.yaml @@ -23,7 +23,7 @@ apiVersion: groups.azuread.upbound.io/v1beta1 kind: Group metadata: annotations: - uptest.upbound.io/pre-delete-hook: testhooks/delete-member.sh + uptest.upbound.io/pre-delete-hook: ../testhooks/delete-member.sh meta.upbound.io/example-id: groups/v1beta1/member labels: testing.upbound.io/example-name: example diff --git a/examples/groups/v1beta2/group.yaml b/examples/groups/v1beta2/group.yaml new file mode 100644 index 00000000..fdf6b7d7 --- /dev/null +++ b/examples/groups/v1beta2/group.yaml @@ -0,0 +1,16 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: groups.azuread.upbound.io/v1beta2 +kind: Group +metadata: + annotations: + meta.upbound.io/example-id: groups/v1beta1/group + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + displayName: example + securityEnabled: true diff --git a/examples/invitations/invitation.yaml b/examples/invitations/v1beta1/invitation.yaml similarity index 100% rename from examples/invitations/invitation.yaml rename to examples/invitations/v1beta1/invitation.yaml diff --git a/examples/invitations/v1beta2/invitation.yaml b/examples/invitations/v1beta2/invitation.yaml new file mode 100644 index 00000000..8f23b370 --- /dev/null +++ b/examples/invitations/v1beta2/invitation.yaml @@ -0,0 +1,19 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: invitations.azuread.upbound.io/v1beta2 +kind: Invitation +metadata: + annotations: + meta.upbound.io/example-id: invitations/v1beta1/invitation + upjet.upbound.io/manual-intervention: "This resource either requires a user with an email in untrusted domain + (but this needs collaboration configuration) or an email in a trusted domain (but in our testing account invitations + in this domain has been disabled)" + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + userEmailAddress: testuser@upbound.io + redirectUrl: https://portal.azure.com diff --git a/examples/policies/claimsmappingpolicy.yaml b/examples/policies/v1beta1/claimsmappingpolicy.yaml similarity index 100% rename from examples/policies/claimsmappingpolicy.yaml rename to examples/policies/v1beta1/claimsmappingpolicy.yaml diff --git a/examples/serviceprincipaldelegated/permissiongrant.yaml b/examples/serviceprincipaldelegated/v1beta1/permissiongrant.yaml similarity index 94% rename from examples/serviceprincipaldelegated/permissiongrant.yaml rename to examples/serviceprincipaldelegated/v1beta1/permissiongrant.yaml index bcdca2db..92d8617c 100644 --- a/examples/serviceprincipaldelegated/permissiongrant.yaml +++ b/examples/serviceprincipaldelegated/v1beta1/permissiongrant.yaml @@ -29,7 +29,7 @@ kind: Principal metadata: annotations: meta.upbound.io/example-id: serviceprincipaldelegated/v1beta1/permissiongrant - uptest.upbound.io/pre-delete-hook: testhooks/delete-permissiongrant.sh + uptest.upbound.io/pre-delete-hook: ../testhooks/delete-permissiongrant.sh labels: testing.upbound.io/example-name: example name: example @@ -66,7 +66,7 @@ kind: Principal metadata: annotations: meta.upbound.io/example-id: serviceprincipaldelegated/v1beta1/permissiongrant - uptest.upbound.io/pre-delete-hook: testhooks/delete-permissiongrant.sh + uptest.upbound.io/pre-delete-hook: ../testhooks/delete-permissiongrant.sh labels: testing.upbound.io/example-name: msgraph name: msgraph diff --git a/examples/serviceprincipals/certificate.yaml b/examples/serviceprincipals/v1beta1/certificate.yaml similarity index 100% rename from examples/serviceprincipals/certificate.yaml rename to examples/serviceprincipals/v1beta1/certificate.yaml diff --git a/examples/serviceprincipals/claimsmappingpolicyassignment.yaml b/examples/serviceprincipals/v1beta1/claimsmappingpolicyassignment.yaml similarity index 100% rename from examples/serviceprincipals/claimsmappingpolicyassignment.yaml rename to examples/serviceprincipals/v1beta1/claimsmappingpolicyassignment.yaml diff --git a/examples/serviceprincipals/password.yaml b/examples/serviceprincipals/v1beta1/password.yaml similarity index 100% rename from examples/serviceprincipals/password.yaml rename to examples/serviceprincipals/v1beta1/password.yaml diff --git a/examples/serviceprincipals/principal.yaml b/examples/serviceprincipals/v1beta1/principal.yaml similarity index 100% rename from examples/serviceprincipals/principal.yaml rename to examples/serviceprincipals/v1beta1/principal.yaml diff --git a/examples/serviceprincipals/tokensigningcertificate.yaml b/examples/serviceprincipals/v1beta1/tokensigningcertificate.yaml similarity index 100% rename from examples/serviceprincipals/tokensigningcertificate.yaml rename to examples/serviceprincipals/v1beta1/tokensigningcertificate.yaml diff --git a/examples/serviceprincipals/v1beta2/principal.yaml b/examples/serviceprincipals/v1beta2/principal.yaml new file mode 100644 index 00000000..695391c2 --- /dev/null +++ b/examples/serviceprincipals/v1beta2/principal.yaml @@ -0,0 +1,30 @@ +# SPDX-FileCopyrightText: 2024 The Crossplane Authors +# +# SPDX-License-Identifier: CC0-1.0 + +apiVersion: serviceprincipals.azuread.upbound.io/v1beta2 +kind: Principal +metadata: + annotations: + meta.upbound.io/example-id: serviceprincipals/v1beta1/principal + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + applicationIdSelector: + matchLabels: + testing.upbound.io/example-name: example + appRoleAssignmentRequired: false +--- +apiVersion: applications.azuread.upbound.io/v1beta1 +kind: Application +metadata: + annotations: + meta.upbound.io/example-id: serviceprincipals/v1beta1/principal + labels: + testing.upbound.io/example-name: example + name: example +spec: + forProvider: + displayName: example diff --git a/examples/synchronization/job.yaml b/examples/synchronization/v1beta1/job.yaml similarity index 97% rename from examples/synchronization/job.yaml rename to examples/synchronization/v1beta1/job.yaml index ac749d6b..858852b6 100644 --- a/examples/synchronization/job.yaml +++ b/examples/synchronization/v1beta1/job.yaml @@ -23,7 +23,7 @@ kind: Secret metadata: annotations: meta.upbound.io/example-id: synchronization/v1beta1/job - uptest.upbound.io/pre-delete-hook: testhooks/delete-secret.sh + uptest.upbound.io/pre-delete-hook: ../testhooks/delete-secret.sh labels: testing.upbound.io/example-name: example name: example diff --git a/examples/synchronization/secret.yaml b/examples/synchronization/v1beta1/secret.yaml similarity index 96% rename from examples/synchronization/secret.yaml rename to examples/synchronization/v1beta1/secret.yaml index 88352b2a..a5eddae4 100644 --- a/examples/synchronization/secret.yaml +++ b/examples/synchronization/v1beta1/secret.yaml @@ -42,7 +42,7 @@ kind: Principal metadata: annotations: meta.upbound.io/example-id: synchronization/v1beta1/secret - uptest.upbound.io/pre-delete-hook: testhooks/delete-secret.sh + uptest.upbound.io/pre-delete-hook: ../testhooks/delete-secret.sh labels: testing.upbound.io/example-name: example name: example diff --git a/examples/users/user.yaml b/examples/users/v1beta1/user.yaml similarity index 100% rename from examples/users/user.yaml rename to examples/users/v1beta1/user.yaml