diff --git a/models/resources/interfaces.go b/models/resources/interfaces.go index 943de7e..3169fd0 100755 --- a/models/resources/interfaces.go +++ b/models/resources/interfaces.go @@ -18,6 +18,7 @@ type ResourceInterface interface { ClearEnv() utils.DBObject SetAllowedInstances(request *tools.APIRequest, instance_id ...string) AddInstances(instance ResourceInstanceITF) + GetSelectedInstance(index *int) ResourceInstanceITF } type ResourceInstanceITF interface { diff --git a/models/resources/native_tools.go b/models/resources/native_tools.go index 228c030..8b4ab0e 100644 --- a/models/resources/native_tools.go +++ b/models/resources/native_tools.go @@ -55,6 +55,10 @@ func (w *NativeTool) ConvertToPricedResource(t tools.DataType, selectedInstance }, nil } +func (r *NativeTool) GetSelectedInstance(selected *int) ResourceInstanceITF { + return nil +} + func InitNative() { for _, kind := range []native_tools.NativeToolsEnum{native_tools.WORKFLOW_EVENT} { newNative := &NativeTool{} diff --git a/models/resources/workflow.go b/models/resources/workflow.go index 898f3b3..63a2818 100755 --- a/models/resources/workflow.go +++ b/models/resources/workflow.go @@ -37,6 +37,10 @@ func (w *WorkflowResource) SetAllowedInstances(request *tools.APIRequest, ids .. /* EMPTY */ } +func (r *WorkflowResource) GetSelectedInstance(selected *int) ResourceInstanceITF { + return nil +} + func (w *WorkflowResource) ConvertToPricedResource(t tools.DataType, selectedInstance *int, selectedPartnership *int, selectedBuyingStrategy *int, selectedStrategy *int, selectedBookingModeIndex *int, request *tools.APIRequest) (pricing.PricedItemITF, error) { return &PricedResource{ Name: w.Name, diff --git a/tools/kubernetes.go b/tools/kubernetes.go index cad5b03..703d8fd 100644 --- a/tools/kubernetes.go +++ b/tools/kubernetes.go @@ -616,16 +616,6 @@ func (k *KubernetesService) CreateSecret(context context.Context, minioId string return nil } -// Returns a concatenation of the peerId and namespace in order for -// kubernetes ressources to have a unique name, under 63 characters -// and yet identify which peer they are created for -func getConcatenatedName(peerId string, namespace string) string { - s := strings.Split(namespace, "-")[:2] - n := s[0] + "-" + s[1] - - return peerId + "-" + n -} - // ============== ADMIRALTY ============== // Returns a concatenation of the peerId and namespace in order for // kubernetes ressources to have a unique name, under 63 characters