Payment Flow + Access Flow Change
This commit is contained in:
+21
-1
@@ -36,6 +36,10 @@ const (
|
||||
SERVICE_RESOURCE
|
||||
DYNAMIC_RESOURCE
|
||||
LIVE_SERVICE
|
||||
PAYMENT
|
||||
REFUND
|
||||
DISCOUNT
|
||||
SUBSCRIPTION
|
||||
)
|
||||
|
||||
var NOAPI = func() string {
|
||||
@@ -96,6 +100,10 @@ var InnerDefaultAPI = [...]func() string{
|
||||
CATALOGAPI,
|
||||
CATALOGAPI,
|
||||
DATACENTERAPI,
|
||||
NOAPI,
|
||||
NOAPI,
|
||||
NOAPI,
|
||||
NOAPI,
|
||||
}
|
||||
|
||||
// Bind the standard data name to the data type
|
||||
@@ -126,6 +134,10 @@ var Str = [...]string{
|
||||
"service_resource",
|
||||
"dynamic_resource",
|
||||
"live_service",
|
||||
"payment",
|
||||
"refund",
|
||||
"discount",
|
||||
"subscription",
|
||||
}
|
||||
|
||||
func FromString(comp string) int {
|
||||
@@ -161,7 +173,8 @@ func DataTypeList() []DataType {
|
||||
return []DataType{DATA_RESOURCE, PROCESSING_RESOURCE, STORAGE_RESOURCE, COMPUTE_RESOURCE, WORKFLOW_RESOURCE,
|
||||
WORKFLOW, WORKFLOW_EXECUTION, WORKSPACE, PEER, COLLABORATIVE_AREA, RULE, BOOKING, WORKFLOW_HISTORY, WORKSPACE_HISTORY,
|
||||
ORDER, PURCHASE_RESOURCE,
|
||||
LIVE_DATACENTER, LIVE_STORAGE, BILL, NATIVE_TOOL, EXECUTION_VERIFICATION, ALLOWED_IMAGE, SERVICE_RESOURCE, DYNAMIC_RESOURCE, LIVE_SERVICE}
|
||||
LIVE_DATACENTER, LIVE_STORAGE, BILL, NATIVE_TOOL, EXECUTION_VERIFICATION, ALLOWED_IMAGE, SERVICE_RESOURCE, DYNAMIC_RESOURCE, LIVE_SERVICE,
|
||||
PAYMENT, REFUND, DISCOUNT, SUBSCRIPTION}
|
||||
}
|
||||
|
||||
type PropalgationMessage struct {
|
||||
@@ -191,6 +204,10 @@ const (
|
||||
// PB_PROPAGATE is used by oc-discovery to broadcast a peer's online/offline
|
||||
// state to other oc-discovery nodes in the federation via PROPALGATION_EVENT.
|
||||
PB_PROPAGATE
|
||||
// PB_SOURCE_PRESIGN is sent by oc-datacenter to request a pre-signed Minio URL
|
||||
// for a private source resource (isReachable=false, Phase 4).
|
||||
// oc-discovery routes it to the resource owner peer via ProtocolSourcePresignResource.
|
||||
PB_SOURCE_PRESIGN
|
||||
)
|
||||
|
||||
func GetActionString(ss string) PubSubAction {
|
||||
@@ -223,6 +240,8 @@ func GetActionString(ss string) PubSubAction {
|
||||
return PB_OBSERVE_CLOSE
|
||||
case "propagate":
|
||||
return PB_PROPAGATE
|
||||
case "source_presign":
|
||||
return PB_SOURCE_PRESIGN
|
||||
default:
|
||||
return NONE
|
||||
}
|
||||
@@ -246,6 +265,7 @@ var path = []string{
|
||||
"observe", // 13 PB_OBSERVE
|
||||
"observe_close", // 14 PB_OBSERVE_CLOSE
|
||||
"propagate", // 15 PB_PROPAGATE
|
||||
"source_presign", // 16 PB_SOURCE_PRESIGN
|
||||
}
|
||||
|
||||
func (m PubSubAction) String() string {
|
||||
|
||||
@@ -599,6 +599,16 @@ func (k *KubernetesService) CreateSecret(context context.Context, minioId string
|
||||
return nil
|
||||
}
|
||||
|
||||
// DeleteSecretsByLabel deletes all Secrets in the given namespace matching labelSelector.
|
||||
// Used by oc-datacenter to clean up ephemeral source-presigned Secrets after workflow completion.
|
||||
func (k *KubernetesService) DeleteSecretsByLabel(ctx context.Context, namespace, labelSelector string) error {
|
||||
return k.Set.CoreV1().Secrets(namespace).DeleteCollection(
|
||||
ctx,
|
||||
metav1.DeleteOptions{},
|
||||
metav1.ListOptions{LabelSelector: labelSelector},
|
||||
)
|
||||
}
|
||||
|
||||
// CreatePVC creates a static PersistentVolume + PersistentVolumeClaim in the given namespace.
|
||||
// Static provisioning (no StorageClass) avoids the WaitForFirstConsumer deadlock
|
||||
// with Admiralty virtual nodes — the PVC binds immediately.
|
||||
|
||||
@@ -32,6 +32,7 @@ var meths = []string{"remove execution", "create execution", "planner execution"
|
||||
"considers event", "admiralty config event", "minio config event", "pvc config event",
|
||||
"workflow started event", "workflow step done event", "workflow done event",
|
||||
"peer behavior event", "peer observe response event", "peer observe event",
|
||||
"source presign event",
|
||||
}
|
||||
|
||||
const (
|
||||
@@ -78,6 +79,12 @@ const (
|
||||
// or stop observing a remote peer. Payload contains the target peer_id and a
|
||||
// boolean close flag.
|
||||
PEER_OBSERVE_EVENT
|
||||
|
||||
// SOURCE_PRESIGN_EVENT is emitted by oc-discovery on the resource-owner peer
|
||||
// when it receives a PB_SOURCE_PRESIGN request routed via libp2p.
|
||||
// oc-datacenter listens to it to generate a pre-signed Minio URL and reply
|
||||
// via PB_CONSIDERS (Phase 4 — isReachable=false).
|
||||
SOURCE_PRESIGN_EVENT
|
||||
)
|
||||
|
||||
func (n NATSMethod) String() string {
|
||||
@@ -90,7 +97,8 @@ func NameToMethod(name string) NATSMethod {
|
||||
CREATE_RESOURCE, REMOVE_RESOURCE, PROPALGATION_EVENT, SEARCH_EVENT, CONFIRM_EVENT,
|
||||
CONSIDERS_EVENT, ADMIRALTY_CONFIG_EVENT, MINIO_CONFIG_EVENT, PVC_CONFIG_EVENT,
|
||||
WORKFLOW_STARTED_EVENT, WORKFLOW_STEP_DONE_EVENT, WORKFLOW_DONE_EVENT,
|
||||
PEER_BEHAVIOR_EVENT, PEER_OBSERVE_RESPONSE_EVENT, PEER_OBSERVE_EVENT} {
|
||||
PEER_BEHAVIOR_EVENT, PEER_OBSERVE_RESPONSE_EVENT, PEER_OBSERVE_EVENT,
|
||||
SOURCE_PRESIGN_EVENT} {
|
||||
if strings.Contains(strings.ToLower(v.String()), strings.ToLower(name)) {
|
||||
return v
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user