Skip defaulting when using instance principals (#136)

Author: Harvey Lowndes

pkg/oci/client/config.go

@@ -78,8 +78,10 @@ func NewConfig(r io.Reader) (*Config, error) {
 
 	c.metadata = instancemeta.New()
 
-	if err := c.setDefaults(); err != nil {
-		return nil, err
+	if !c.UseInstancePrincipals {
+		if err := c.setDefaults(); err != nil {
+			return nil, err
+		}
 	}
 
 	if err := c.validate(); err != nil {
@@ -168,6 +170,9 @@ func validateAuthConfig(c *Config, fldPath *field.Path) field.ErrorList {
 		if c.Auth.Region != "" {
 			errList = append(errList, field.Forbidden(fldPath.Child("region"), "cannot be used when useInstancePrincipals is enabled"))
 		}
+		if c.Auth.CompartmentOCID != "" {
+			errList = append(errList, field.Forbidden(fldPath.Child("compartment"), "cannot be used when useInstancePrincipals is enabled"))
+		}
 		if c.Auth.TenancyOCID != "" {
 			errList = append(errList, field.Forbidden(fldPath.Child("tenancy"), "cannot be used when useInstancePrincipals is enabled"))
 		}