A tenancy should be a valid compartment since it is technically...

[jlamillan]

Proposed changes

This PR is a back-port of of the following PR:

• A tenancy should be a valid compartment since it is technically the r… #4038

Types of changes

Backport of small, but important bug-fixe.

Linked Issues

• RKE2 - Root OCID tenancy compartment error rancher-plugins/kontainer-engine-driver-oke#45
• Can not use "root" compartment for OKE rancher-plugins/kontainer-engine-driver-oke#13

Further comments

[richard-cox]

It looks like this contains the exact same change as #4038 and targets the same branch (master). Guessing with a rebase the diff would disappear.

I'll close the PR, @jlamillan just let us know if you have any questions

[jlamillan]

Hey @richard-cox

I'm not seeing that the changes in this PR are included in master.

i.e. master has:

    if (!compartmentId.startsWith('ocid1.compartment')) {
      errors.push('A valid compartment OCID is required');
    }

we want:

    if (!compartmentId.startsWith('ocid1.compartment') && !compartmentId.startsWith('ocid1.tenancy')) {
      errors.push('A valid compartment OCID is required');
    }

[richard-cox]

Strange, as both https://github.com/rancher/ui/pull/4038/files and https://github.com/rancher/ui/pull/4857/files both have the same files and branch with the former merged.

Sorry for the confusion.