Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ Future supported clouds: AWS
## Support Matrix
Cloud | Mint | Mint + Remove Admin Cred | Passthrough | Manual | Token
--- | --- | --- | --- | --- | ---
AlibabaCloud | N | N | N | Y | N
AWS | Y | 4.4+ | Y | 4.3+ | 4.6+ (expected)
Azure | Y | N | Y | Y | N
GCP | Y | 4.7+ | Y | Y | N
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/cloudcredential/v1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {

scheme.AddKnownTypes(SchemeGroupVersion,
&CredentialsRequest{}, &CredentialsRequestList{},
&AlibabaCloudProviderStatus{}, &AlibabaCloudProviderSpec{},
&AWSProviderStatus{}, &AWSProviderSpec{},
&AzureProviderStatus{}, &AzureProviderSpec{},
&GCPProviderStatus{}, &GCPProviderSpec{},
Expand Down
56 changes: 56 additions & 0 deletions pkg/apis/cloudcredential/v1/types_alibabacloud.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
Copyright 2021 The OpenShift Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// TODO: these types should eventually be broken out, along with the actuator, to a separate repo.

// AlibabaCloudProviderSpec is the specification of the credentials request in Alibaba Cloud.
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AlibabaCloudProviderSpec struct {
metav1.TypeMeta `json:",inline"`
Statement []Entry `json:"statement"`
}

// Entry models an Alibaba Cloud policy statement entry.
type Entry struct {
// Effect indicates if this policy statement is to Allow or Deny.
Effect string `json:"effect"`
// Action describes the particular Alibaba Cloud service actions that should be allowed or denied. (i.e. ecs:StartInstances, actiontrail:LookupEvents)
Action []string `json:"action"`
// Resource specifies the object(s) this statement should apply to. (or "*" for all)
Resource string `json:"resource"`
// Condition specifies under which condition Entry will apply
Condition Condition `json:"condition,omitempty"`
}

// Condition - map of condition types, with associated key - value mapping
// +k8s:deepcopy-gen=false
type Condition map[string]ConditionKeyValue

// ConditionKeyValue - mapping of values for the chosen type
// +k8s:deepcopy-gen=false
type ConditionKeyValue map[string]interface{}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using type interface{} complicates generating deep-copy functions. See https://github.com/openshift/cloud-credential-operator/blob/master/pkg/apis/cloudcredential/v1/aws_manual.deepcopy.go and openshift/api#683 (review) .

Just because we made this mistake for the AWS cloud, does not mean we should repeat it for Alibaba Cloud. Please specify the exact values this field can hold, or just remove the ability to specify conditions as part of each Entry.

If we do in fact expect to have components specify static Conditions as part of their permissions lists, I'd like to see some examples.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your review.
At present, Condition is not needed in Alibaba Cloud's credsRequest, so I removed it.


// AlibabaCloudProviderStatus contains the status of the Alibaba Cloud credentials request.
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AlibabaCloudProviderStatus struct {
metav1.TypeMeta `json:",inline"`
}
107 changes: 107 additions & 0 deletions pkg/apis/cloudcredential/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.