From 54bb3120a41d6b1f08b140a2a4e66062fc7e2008 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Wed, 2 Nov 2022 15:35:33 -0700 Subject: [PATCH 1/8] APIGOV-24037 - regen code for api server spec --- .../clients/catalog/v1/SupportContact.go | 154 +++++++++++++++++ .../catalog/v1alpha1/SupportContact.go | 154 +++++++++++++++++ pkg/apic/apiserver/clients/set.go | 10 ++ .../models/catalog/v1/SupportContact.go | 155 ++++++++++++++++++ .../models/catalog/v1/model_category_spec.go | 2 +- .../models/catalog/v1/model_document_spec.go | 2 +- .../v1/model_document_spec_sections.go | 2 +- .../catalog/v1/model_document_status.go | 2 +- .../catalog/v1/model_marketplace_spec.go | 2 +- .../catalog/v1/model_product_overview_spec.go | 2 +- .../model_product_overview_spec_documents.go | 2 +- .../catalog/v1/model_product_references.go | 2 +- .../v1/model_product_references_assets.go | 2 +- .../v1/model_product_references_release.go | 2 +- .../catalog/v1/model_product_release_spec.go | 2 +- .../v1/model_product_release_spec_assets.go | 2 +- .../v1/model_product_release_spec_release.go | 2 +- .../v1/model_product_release_status.go | 2 +- .../v1/model_product_release_status_error.go | 4 +- .../model_product_release_status_pending.go | 4 +- ...del_product_release_status_pending_meta.go | 16 -- .../model_product_release_status_success.go | 4 +- .../models/catalog/v1/model_product_spec.go | 10 +- .../catalog/v1/model_product_spec_assets.go | 2 +- .../model_product_spec_auto_release.go} | 7 +- .../catalog/v1/model_product_spec_filters.go | 2 +- .../models/catalog/v1/model_product_status.go | 2 +- .../catalog/v1/model_product_status_meta.go | 2 +- .../v1/model_product_status_reasons.go | 2 +- .../models/catalog/v1/model_quota_spec.go | 2 +- ...el_quota_spec_limit_type_loose_overages.go | 1 - ...odel_quota_spec_limit_type_tiered_tiers.go | 2 - .../models/catalog/v1/model_quota_status.go | 2 +- .../models/catalog/v1/model_resource_spec.go | 2 +- .../catalog/v1/model_support_contact_spec.go | 18 ++ .../catalog/v1alpha1/AccessControlList.go | 2 +- .../models/catalog/v1alpha1/AssetRequest.go | 28 +++- .../models/catalog/v1alpha1/SupportContact.go | 155 ++++++++++++++++++ ...ss_control_list_spec_access_level_scope.go | 6 + ...trol_list_spec_access_level_scoped_kind.go | 6 + ..._list_spec_access_level_scoped_resource.go | 4 + .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- .../v1alpha1/model_application_marketplace.go | 2 +- .../model_application_marketplace_resource.go | 2 +- ...plication_marketplace_resource_metadata.go | 2 +- ..._application_marketplace_resource_owner.go | 2 +- ...marketplace_resource_owner_organization.go | 2 +- .../v1alpha1/model_application_spec.go | 2 +- .../model_application_spec_security.go | 2 +- .../catalog/v1alpha1/model_asset_access.go | 2 +- .../v1alpha1/model_asset_mapping_spec.go | 2 +- .../model_asset_mapping_spec_inputs.go | 4 +- .../v1alpha1/model_asset_mapping_status.go | 2 +- .../model_asset_mapping_status_outputs.go | 2 +- .../model_asset_mapping_status_resource.go | 2 +- ..._mapping_status_resource_asset_resource.go | 2 +- ...del_asset_mapping_status_resource_stage.go | 2 +- .../model_asset_mapping_status_source.go | 2 +- ...el_asset_mapping_status_source_resource.go | 2 +- ...ping_status_source_resource_api_service.go | 2 +- ...us_source_resource_api_service_instance.go | 2 +- ...us_source_resource_api_service_revision.go | 2 +- ..._source_resource_asset_mapping_template.go | 2 +- .../v1alpha1/model_asset_release_spec.go | 2 +- .../v1alpha1/model_asset_release_status.go | 2 +- .../model_asset_release_status_meta.go | 2 +- .../model_asset_release_status_reasons.go | 2 +- .../v1alpha1/model_asset_request_approval.go | 2 +- .../model_asset_request_approval_state.go | 2 +- ..._asset_request_definition_authorization.go | 2 +- .../model_asset_request_definition_spec.go | 4 +- ...asset_request_definition_spec_provision.go | 4 +- .../model_asset_request_marketplace.go} | 11 +- ...odel_asset_request_marketplace_resource.go | 16 ++ ..._request_marketplace_resource_metadata.go} | 4 +- ...set_request_marketplace_resource_owner.go} | 8 +- .../model_asset_request_references.go | 2 +- .../v1alpha1/model_asset_request_spec.go | 3 +- .../v1alpha1/model_asset_request_status.go | 4 +- .../model_asset_request_status_reasons.go | 28 ---- .../model_asset_resource_references.go | 2 +- .../v1alpha1/model_asset_resource_spec.go | 2 +- .../model_asset_resource_spec_access_info.go | 2 +- .../catalog/v1alpha1/model_asset_spec.go | 5 +- ...on.go => model_asset_spec_auto_release.go} | 7 +- .../catalog/v1alpha1/model_asset_status.go | 2 +- .../v1alpha1/model_asset_status_meta.go | 2 +- .../v1alpha1/model_asset_status_reasons.go | 2 +- .../model_authorization_profile_references.go | 2 +- .../model_authorization_profile_spec.go | 2 +- .../catalog/v1alpha1/model_category_spec.go | 2 +- .../v1alpha1/model_credential_marketplace.go | 2 +- .../model_credential_marketplace_resource.go | 6 +- ...l_credential_marketplace_resource_owner.go | 6 +- .../v1alpha1/model_credential_policies.go | 2 +- .../model_credential_policies_expiry.go | 2 +- .../v1alpha1/model_credential_references.go | 2 +- ...redential_request_definition_references.go | 2 +- ...odel_credential_request_definition_spec.go | 4 +- ...ntial_request_definition_spec_provision.go | 4 +- ...uest_definition_spec_provision_policies.go | 2 +- ...finition_spec_provision_policies_expiry.go | 2 +- ..._spec_provision_policies_expiry_actions.go | 2 +- .../catalog/v1alpha1/model_credential_spec.go | 4 +- .../v1alpha1/model_credential_spec_state.go | 4 +- .../v1alpha1/model_credential_state.go | 2 +- .../v1alpha1/model_credential_status.go | 2 +- .../model_credential_status_reasons.go | 7 +- .../catalog/v1alpha1/model_document_spec.go | 2 +- .../model_document_spec_asset_resource_ref.go | 18 -- .../v1alpha1/model_document_spec_sections.go | 2 +- .../catalog/v1alpha1/model_document_status.go | 2 +- .../v1alpha1/model_marketplace_spec.go | 2 +- .../v1alpha1/model_product_overview_spec.go | 2 +- .../model_product_overview_spec_documents.go | 2 +- .../v1alpha1/model_product_plan_references.go | 2 +- .../model_product_plan_references_product.go | 2 +- .../v1alpha1/model_product_plan_spec.go | 2 +- .../model_product_plan_spec_billing.go | 3 +- .../model_product_plan_spec_features.go | 2 +- .../model_product_plan_spec_subscription.go | 2 +- ...product_plan_spec_subscription_interval.go | 2 +- .../v1alpha1/model_product_plan_status.go | 4 +- .../model_product_plan_status_reasons.go | 28 ---- .../v1alpha1/model_product_plan_unit_spec.go | 2 +- .../v1alpha1/model_product_references.go | 2 +- .../model_product_references_assets.go | 2 +- .../model_product_references_release.go | 2 +- .../v1alpha1/model_product_release_spec.go | 2 +- .../model_product_release_spec_assets.go | 2 +- .../model_product_release_spec_release.go | 2 +- .../v1alpha1/model_product_release_status.go | 2 +- .../model_product_release_status_error.go | 4 +- .../model_product_release_status_pending.go | 4 +- .../model_product_release_status_success.go | 4 +- .../catalog/v1alpha1/model_product_spec.go | 10 +- .../v1alpha1/model_product_spec_assets.go | 2 +- ....go => model_product_spec_auto_release.go} | 7 +- .../v1alpha1/model_product_spec_filters.go | 2 +- .../catalog/v1alpha1/model_product_status.go | 2 +- .../v1alpha1/model_product_status_meta.go | 2 +- .../v1alpha1/model_product_status_reasons.go | 2 +- .../v1alpha1/model_product_visibility_spec.go | 2 +- .../model_product_visibility_spec_products.go | 2 +- .../model_published_product_references.go | 2 +- ...el_published_product_references_release.go | 2 +- .../v1alpha1/model_published_product_spec.go | 2 +- .../model_published_product_spec_product.go | 2 +- .../catalog/v1alpha1/model_quota_spec.go | 2 +- ...el_quota_spec_limit_type_loose_overages.go | 1 - ...odel_quota_spec_limit_type_tiered_tiers.go | 2 - .../catalog/v1alpha1/model_quota_status.go | 2 +- .../v1alpha1/model_release_tag_spec.go | 2 +- .../v1alpha1/model_release_tag_status.go | 2 +- .../catalog/v1alpha1/model_resource_spec.go | 2 +- .../catalog/v1alpha1/model_secret_spec.go | 4 +- .../catalog/v1alpha1/model_stage_spec.go | 2 +- .../v1alpha1/model_subscription_approval.go | 2 +- .../model_subscription_marketplace.go | 6 +- ...model_subscription_marketplace_resource.go | 16 -- ...scription_marketplace_resource_metadata.go | 18 -- .../v1alpha1/model_subscription_spec.go | 2 +- .../v1alpha1/model_subscription_spec_plan.go | 2 +- .../v1alpha1/model_subscription_status.go | 2 +- .../model_subscription_status_reasons.go | 7 +- .../v1alpha1/model_support_contact_spec.go | 18 ++ .../catalog/v1alpha1/model_webhook_spec.go | 4 +- .../v1alpha1/model_webhook_spec_auth.go | 2 +- .../model_webhook_spec_auth_secret.go | 2 +- ...ss_control_list_spec_access_level_scope.go | 6 + ...trol_list_spec_access_level_scoped_kind.go | 6 + ..._list_spec_access_level_scoped_resource.go | 4 + .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- .../model_command_line_interface_spec.go | 2 +- ...del_command_line_interface_spec_columns.go | 2 +- ...model_command_line_interface_spec_names.go | 2 +- .../model_resource_definition_spec.go | 2 +- ...del_resource_definition_spec_references.go | 2 +- ...esource_definition_spec_references_from.go | 2 +- ...ource_definition_spec_references_from_1.go | 2 +- ...finition_spec_references_from_resources.go | 2 +- ...definition_spec_references_to_resources.go | 2 +- .../model_resource_definition_spec_scope.go | 2 +- ..._resource_definition_spec_sub_resources.go | 2 +- .../model_resource_definition_version_spec.go | 4 +- ...ss_control_list_spec_access_level_scope.go | 6 + ...trol_list_spec_access_level_scoped_kind.go | 6 + ..._list_spec_access_level_scoped_resource.go | 4 + .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- ...ccess_request_definition_spec_provision.go | 4 +- .../model_access_request_spec_quota.go | 2 +- .../v1alpha1/model_access_request_status.go | 2 +- .../model_access_request_status_reasons.go | 7 +- .../v1alpha1/model_amplify_config_spec.go | 2 +- .../model_amplify_config_spec_address.go | 2 +- .../model_amplify_jwt_auth_rule_spec.go | 4 +- .../model_amplify_jwt_auth_rule_spec_from.go | 5 +- .../model_amplify_jwt_auth_rule_spec_jwks.go | 2 +- .../model_amplify_o_auth2_auth_rule_spec.go | 2 +- .../model_amplify_runtime_config_spec.go | 4 +- .../model_amplify_runtime_config_status.go | 2 +- .../v1alpha1/model_api_key_auth_rule_spec.go | 4 +- .../v1alpha1/model_api_service_details.go | 2 +- .../model_api_service_instance_spec.go | 2 +- ...odel_api_service_instance_spec_endpoint.go | 2 +- ...model_api_service_instance_spec_routing.go | 4 +- .../model_api_service_revision_spec.go | 2 +- ...el_api_service_revision_spec_definition.go | 2 +- .../v1alpha1/model_api_service_spec.go | 2 +- .../v1alpha1/model_api_service_spec_icon.go | 2 +- .../v1alpha1/model_api_service_status.go | 2 +- .../v1alpha1/model_api_spec_spec.go | 2 +- .../model_api_spec_spec_definition.go | 2 +- .../v1alpha1/model_api_spec_spec_endpoints.go | 4 +- .../v1alpha1/model_asset_mapping_spec.go | 2 +- .../model_asset_mapping_spec_inputs.go | 4 +- .../v1alpha1/model_asset_mapping_status.go | 2 +- .../model_asset_mapping_status_outputs.go | 2 +- .../model_asset_mapping_status_resource.go | 2 +- ..._mapping_status_resource_asset_resource.go | 2 +- ...del_asset_mapping_status_resource_stage.go | 2 +- .../model_asset_mapping_status_source.go | 2 +- ...el_asset_mapping_status_source_resource.go | 2 +- ...ping_status_source_resource_api_service.go | 2 +- ...us_source_resource_api_service_instance.go | 2 +- ...us_source_resource_api_service_revision.go | 2 +- ..._source_resource_asset_mapping_template.go | 2 +- .../model_asset_mapping_template_spec.go | 2 +- ...asset_mapping_template_spec_api_service.go | 4 +- ...ping_template_spec_api_service_revision.go | 4 +- ...i_service_revision_api_service_instance.go | 4 +- ...model_asset_mapping_template_spec_asset.go | 2 +- ...del_asset_mapping_template_spec_filters.go | 2 +- .../model_consumer_instance_references.go | 2 +- .../v1alpha1/model_consumer_instance_spec.go | 2 +- ...nstance_spec_additional_data_properties.go | 2 +- .../model_consumer_instance_spec_icon.go | 2 +- ...del_consumer_instance_spec_subscription.go | 2 +- ...tance_spec_unstructured_data_properties.go | 2 +- .../model_consumer_instance_status.go | 2 +- .../model_consumer_instance_status_phase.go | 2 +- ...l_consumer_subscription_definition_spec.go | 2 +- ...mer_subscription_definition_spec_schema.go | 2 +- ...ption_definition_spec_schema_properties.go | 4 +- .../v1alpha1/model_cors_rule_spec.go | 2 +- .../model_credential_policies_expiry.go | 2 +- .../v1alpha1/model_credential_references.go | 2 +- ...redential_request_definition_references.go | 2 +- ...finition_spec_provision_policies_expiry.go | 2 +- ..._spec_provision_policies_expiry_actions.go | 2 +- .../v1alpha1/model_credential_spec.go | 4 +- .../v1alpha1/model_credential_spec_state.go | 4 +- .../v1alpha1/model_credential_state.go | 2 +- .../v1alpha1/model_credential_status.go | 4 +- .../model_credential_status_reasons.go | 28 ---- .../v1alpha1/model_deployment_references.go | 2 +- .../v1alpha1/model_deployment_spec.go | 2 +- .../v1alpha1/model_deployment_status.go | 2 +- .../v1alpha1/model_discovery_agent_spec.go | 2 +- .../model_discovery_agent_spec_config.go | 2 +- .../model_discovery_agent_spec_logging.go | 2 +- .../v1alpha1/model_discovery_agent_status.go | 2 +- .../v1alpha1/model_environment_spec.go | 7 +- .../v1alpha1/model_environment_spec_icon.go | 2 +- .../v1alpha1/model_external_secret_spec.go | 2 +- ...odel_governance_agent_agentconfigstatus.go | 2 +- .../v1alpha1/model_governance_agent_spec.go | 4 +- .../v1alpha1/model_governance_agent_status.go | 2 +- .../v1alpha1/model_integration_spec.go | 2 +- .../v1alpha1/model_k8_s_cluster_spec.go | 2 +- .../v1alpha1/model_k8_s_resource_spec.go | 8 +- ...del_k8_s_resource_spec_owner_references.go | 2 +- .../model_managed_application_marketplace.go | 2 +- ...anaged_application_marketplace_resource.go | 2 +- ...plication_marketplace_resource_metadata.go | 2 +- ..._application_marketplace_resource_owner.go | 2 +- ...marketplace_resource_owner_organization.go | 2 +- .../model_managed_application_references.go | 2 +- .../model_managed_application_spec.go | 2 +- ...model_managed_application_spec_security.go | 2 +- .../model_managed_application_status.go | 2 +- .../v1alpha1/model_mesh_discovery_spec.go | 2 +- .../v1alpha1/model_mesh_service_spec.go | 4 +- .../model_mesh_service_spec_endpoints.go | 4 +- .../v1alpha1/model_mesh_service_spec_ports.go | 2 +- .../v1alpha1/model_mesh_workload_spec.go | 4 +- .../model_mesh_workload_spec_ports.go | 2 +- .../model_mesh_workload_spec_specs.go | 2 +- .../v1alpha1/model_oas3_document_spec.go | 7 +- .../v1alpha1/model_release_tag_spec.go | 2 +- .../v1alpha1/model_release_tag_status.go | 2 +- .../v1alpha1/model_resource_discovery_spec.go | 5 +- ...esource_discovery_spec_namespace_filter.go | 2 +- ...resource_discovery_spec_resource_filter.go | 5 +- .../v1alpha1/model_resource_hook_spec.go | 2 +- .../model_resource_hook_spec_scope.go | 2 +- .../model_resource_hook_spec_triggers.go | 2 +- .../management/v1alpha1/model_secret_spec.go | 4 +- .../v1alpha1/model_spec_discovery_spec.go | 2 +- ...el_spec_discovery_spec_namespace_filter.go | 2 +- ...del_spec_discovery_spec_resource_filter.go | 5 +- .../model_spec_discovery_spec_targets.go | 2 +- ...spec_discovery_spec_targets_exact_paths.go | 4 +- ..._discovery_spec_targets_from_annotation.go | 2 +- .../v1alpha1/model_traceability_agent_spec.go | 8 +- .../model_traceability_agent_spec_config.go | 2 +- .../model_traceability_agent_spec_logging.go | 16 -- .../model_traceability_agent_status.go | 2 +- .../model_virtual_api_release_spec.go | 2 +- .../v1alpha1/model_virtual_api_spec.go | 2 +- .../v1alpha1/model_virtual_api_status.go | 2 +- .../v1alpha1/model_virtual_host_spec.go | 2 +- .../v1alpha1/model_virtual_service_spec.go | 13 +- ...virtual_service_spec_amplifyjwtauthrule.go | 2 + ...tual_service_spec_amplifyoauth2authrule.go | 2 + ...del_virtual_service_spec_apikeyauthrule.go | 2 + ...el_virtual_service_spec_operation_rules.go | 3 +- .../v1alpha1/model_watch_topic_spec.go | 2 +- .../model_watch_topic_spec_filters.go | 2 +- .../v1alpha1/model_watch_topic_spec_scope.go | 2 +- .../management/v1alpha1/model_webhook_spec.go | 4 +- .../v1alpha1/model_webhook_spec_auth.go | 2 +- .../model_webhook_spec_auth_secret.go | 2 +- 326 files changed, 1146 insertions(+), 580 deletions(-) create mode 100644 pkg/apic/apiserver/clients/catalog/v1/SupportContact.go create mode 100644 pkg/apic/apiserver/clients/catalog/v1alpha1/SupportContact.go create mode 100644 pkg/apic/apiserver/models/catalog/v1/SupportContact.go delete mode 100644 pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go rename pkg/apic/apiserver/models/catalog/{v1alpha1/model_credential_marketplace_resource_owner_organization.go => v1/model_product_spec_auto_release.go} (55%) create mode 100644 pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/SupportContact.go rename pkg/apic/apiserver/models/catalog/{v1/model_document_spec_asset_resource_ref.go => v1alpha1/model_asset_request_marketplace.go} (50%) create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go rename pkg/apic/apiserver/models/catalog/v1alpha1/{model_credential_marketplace_resource_metadata.go => model_asset_request_marketplace_resource_metadata.go} (74%) rename pkg/apic/apiserver/models/catalog/v1alpha1/{model_subscription_marketplace_resource_owner.go => model_asset_request_marketplace_resource_owner.go} (53%) delete mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go rename pkg/apic/apiserver/models/catalog/v1alpha1/{model_subscription_marketplace_resource_owner_organization.go => model_asset_spec_auto_release.go} (54%) delete mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_asset_resource_ref.go delete mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go rename pkg/apic/apiserver/models/catalog/v1alpha1/{model_product_release_status_pending_meta.go => model_product_spec_auto_release.go} (54%) delete mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go delete mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go delete mode 100644 pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go delete mode 100644 pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go diff --git a/pkg/apic/apiserver/clients/catalog/v1/SupportContact.go b/pkg/apic/apiserver/clients/catalog/v1/SupportContact.go new file mode 100644 index 000000000..62a7fd703 --- /dev/null +++ b/pkg/apic/apiserver/clients/catalog/v1/SupportContact.go @@ -0,0 +1,154 @@ +/* + * This file is automatically generated + */ + +package catalog + +import ( + "fmt" + + v1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/api/v1" + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" + m "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/catalog/v1" +) + +type SupportContactMergeFunc func(*m.SupportContact, *m.SupportContact) (*m.SupportContact, error) + +// SupportContactMerge builds a merge option for an update operation +func SupportContactMerge(f SupportContactMergeFunc) v1.UpdateOption { + return v1.Merge(func(prev, new apiv1.Interface) (apiv1.Interface, error) { + p, n := &m.SupportContact{}, &m.SupportContact{} + + switch t := prev.(type) { + case *m.SupportContact: + p = t + case *apiv1.ResourceInstance: + err := p.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialise prev resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise prev resource, unxexpected resource type: %T", t) + } + + switch t := new.(type) { + case *m.SupportContact: + n = t + case *apiv1.ResourceInstance: + err := n.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialize new resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise new resource, unxexpected resource type: %T", t) + } + + return f(p, n) + }) +} + +// SupportContactClient - rest client for SupportContact resources that have a defined resource scope +type SupportContactClient struct { + client v1.Scoped +} + +// NewSupportContactClient - creates a client scoped to a particular resource +func NewSupportContactClient(c v1.Base) (*SupportContactClient, error) { + + client, err := c.ForKind(m.SupportContactGVK()) + if err != nil { + return nil, err + } + + return &SupportContactClient{client}, nil + +} + +// List - gets a list of resources +func (c *SupportContactClient) List(options ...v1.ListOptions) ([]*m.SupportContact, error) { + riList, err := c.client.List(options...) + if err != nil { + return nil, err + } + + result := make([]*m.SupportContact, len(riList)) + + for i := range riList { + result[i] = &m.SupportContact{} + err := result[i].FromInstance(riList[i]) + if err != nil { + return nil, err + } + } + + return result, nil +} + +// Get - gets a resource by name +func (c *SupportContactClient) Get(name string) (*m.SupportContact, error) { + ri, err := c.client.Get(name) + if err != nil { + return nil, err + } + + service := &m.SupportContact{} + service.FromInstance(ri) + + return service, nil +} + +// Delete - deletes a resource +func (c *SupportContactClient) Delete(res *m.SupportContact) error { + ri, err := res.AsInstance() + + if err != nil { + return err + } + + return c.client.Delete(ri) +} + +// Create - creates a resource +func (c *SupportContactClient) Create(res *m.SupportContact, opts ...v1.CreateOption) (*m.SupportContact, error) { + ri, err := res.AsInstance() + + if err != nil { + return nil, err + } + + cri, err := c.client.Create(ri, opts...) + if err != nil { + return nil, err + } + + created := &m.SupportContact{} + + err = created.FromInstance(cri) + if err != nil { + return nil, err + } + + return created, err +} + +// Update - updates a resource +func (c *SupportContactClient) Update(res *m.SupportContact, opts ...v1.UpdateOption) (*m.SupportContact, error) { + ri, err := res.AsInstance() + if err != nil { + return nil, err + } + resource, err := c.client.Update(ri, opts...) + if err != nil { + return nil, err + } + + updated := &m.SupportContact{} + + // Updates the resource in place + err = updated.FromInstance(resource) + if err != nil { + return nil, err + } + + return updated, nil +} diff --git a/pkg/apic/apiserver/clients/catalog/v1alpha1/SupportContact.go b/pkg/apic/apiserver/clients/catalog/v1alpha1/SupportContact.go new file mode 100644 index 000000000..68153350d --- /dev/null +++ b/pkg/apic/apiserver/clients/catalog/v1alpha1/SupportContact.go @@ -0,0 +1,154 @@ +/* + * This file is automatically generated + */ + +package catalog + +import ( + "fmt" + + v1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/api/v1" + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" + m "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/catalog/v1alpha1" +) + +type SupportContactMergeFunc func(*m.SupportContact, *m.SupportContact) (*m.SupportContact, error) + +// SupportContactMerge builds a merge option for an update operation +func SupportContactMerge(f SupportContactMergeFunc) v1.UpdateOption { + return v1.Merge(func(prev, new apiv1.Interface) (apiv1.Interface, error) { + p, n := &m.SupportContact{}, &m.SupportContact{} + + switch t := prev.(type) { + case *m.SupportContact: + p = t + case *apiv1.ResourceInstance: + err := p.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialise prev resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise prev resource, unxexpected resource type: %T", t) + } + + switch t := new.(type) { + case *m.SupportContact: + n = t + case *apiv1.ResourceInstance: + err := n.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialize new resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise new resource, unxexpected resource type: %T", t) + } + + return f(p, n) + }) +} + +// SupportContactClient - rest client for SupportContact resources that have a defined resource scope +type SupportContactClient struct { + client v1.Scoped +} + +// NewSupportContactClient - creates a client scoped to a particular resource +func NewSupportContactClient(c v1.Base) (*SupportContactClient, error) { + + client, err := c.ForKind(m.SupportContactGVK()) + if err != nil { + return nil, err + } + + return &SupportContactClient{client}, nil + +} + +// List - gets a list of resources +func (c *SupportContactClient) List(options ...v1.ListOptions) ([]*m.SupportContact, error) { + riList, err := c.client.List(options...) + if err != nil { + return nil, err + } + + result := make([]*m.SupportContact, len(riList)) + + for i := range riList { + result[i] = &m.SupportContact{} + err := result[i].FromInstance(riList[i]) + if err != nil { + return nil, err + } + } + + return result, nil +} + +// Get - gets a resource by name +func (c *SupportContactClient) Get(name string) (*m.SupportContact, error) { + ri, err := c.client.Get(name) + if err != nil { + return nil, err + } + + service := &m.SupportContact{} + service.FromInstance(ri) + + return service, nil +} + +// Delete - deletes a resource +func (c *SupportContactClient) Delete(res *m.SupportContact) error { + ri, err := res.AsInstance() + + if err != nil { + return err + } + + return c.client.Delete(ri) +} + +// Create - creates a resource +func (c *SupportContactClient) Create(res *m.SupportContact, opts ...v1.CreateOption) (*m.SupportContact, error) { + ri, err := res.AsInstance() + + if err != nil { + return nil, err + } + + cri, err := c.client.Create(ri, opts...) + if err != nil { + return nil, err + } + + created := &m.SupportContact{} + + err = created.FromInstance(cri) + if err != nil { + return nil, err + } + + return created, err +} + +// Update - updates a resource +func (c *SupportContactClient) Update(res *m.SupportContact, opts ...v1.UpdateOption) (*m.SupportContact, error) { + ri, err := res.AsInstance() + if err != nil { + return nil, err + } + resource, err := c.client.Update(ri, opts...) + if err != nil { + return nil, err + } + + updated := &m.SupportContact{} + + // Updates the resource in place + err = updated.FromInstance(resource) + if err != nil { + return nil, err + } + + return updated, nil +} diff --git a/pkg/apic/apiserver/clients/set.go b/pkg/apic/apiserver/clients/set.go index cd2d7222c..f71b86fda 100644 --- a/pkg/apic/apiserver/clients/set.go +++ b/pkg/apic/apiserver/clients/set.go @@ -71,6 +71,7 @@ type Set struct { MarketplaceCatalogV1alpha1 *catalog_v1alpha1.MarketplaceClient PublishedProductCatalogV1alpha1 *catalog_v1alpha1.UnscopedPublishedProductClient ProductVisibilityCatalogV1alpha1 *catalog_v1alpha1.UnscopedProductVisibilityClient + SupportContactCatalogV1alpha1 *catalog_v1alpha1.SupportContactClient ProductCatalogV1alpha1 *catalog_v1alpha1.ProductClient ProductReleaseCatalogV1alpha1 *catalog_v1alpha1.ProductReleaseClient ProductPlanUnitCatalogV1alpha1 *catalog_v1alpha1.ProductPlanUnitClient @@ -90,6 +91,7 @@ type Set struct { AccessControlListCatalogV1alpha1 *catalog_v1alpha1.UnscopedAccessControlListClient CategoryCatalogV1 *catalog_v1.CategoryClient MarketplaceCatalogV1 *catalog_v1.MarketplaceClient + SupportContactCatalogV1 *catalog_v1.SupportContactClient ProductCatalogV1 *catalog_v1.ProductClient ProductReleaseCatalogV1 *catalog_v1.ProductReleaseClient QuotaCatalogV1 *catalog_v1.UnscopedQuotaClient @@ -332,6 +334,10 @@ func New(b cAPIV1.Base) *Set { if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1alpha1.ProductVisibility: %s", err)) } + s.SupportContactCatalogV1alpha1, err = catalog_v1alpha1.NewSupportContactClient(b) + if err != nil { + panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1alpha1.SupportContact: %s", err)) + } s.ProductCatalogV1alpha1, err = catalog_v1alpha1.NewProductClient(b) if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1alpha1.Product: %s", err)) @@ -408,6 +414,10 @@ func New(b cAPIV1.Base) *Set { if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1.Marketplace: %s", err)) } + s.SupportContactCatalogV1, err = catalog_v1.NewSupportContactClient(b) + if err != nil { + panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1.SupportContact: %s", err)) + } s.ProductCatalogV1, err = catalog_v1.NewProductClient(b) if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/catalog/v1.Product: %s", err)) diff --git a/pkg/apic/apiserver/models/catalog/v1/SupportContact.go b/pkg/apic/apiserver/models/catalog/v1/SupportContact.go new file mode 100644 index 000000000..41aa94107 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1/SupportContact.go @@ -0,0 +1,155 @@ +/* + * This file is automatically generated + */ + +package catalog + +import ( + "encoding/json" + + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +var ( + _SupportContactGVK = apiv1.GroupVersionKind{ + GroupKind: apiv1.GroupKind{ + Group: "catalog", + Kind: "SupportContact", + }, + APIVersion: "v1", + } + + SupportContactScopes = []string{""} +) + +const SupportContactResourceName = "supportcontacts" + +func SupportContactGVK() apiv1.GroupVersionKind { + return _SupportContactGVK +} + +func init() { + apiv1.RegisterGVK(_SupportContactGVK, SupportContactScopes[0], SupportContactResourceName) +} + +// SupportContact Resource +type SupportContact struct { + apiv1.ResourceMeta + Owner *apiv1.Owner `json:"owner"` + Spec SupportContactSpec `json:"spec"` +} + +// NewSupportContact creates an empty *SupportContact +func NewSupportContact(name string) *SupportContact { + return &SupportContact{ + ResourceMeta: apiv1.ResourceMeta{ + Name: name, + GroupVersionKind: _SupportContactGVK, + }, + } +} + +// SupportContactFromInstanceArray converts a []*ResourceInstance to a []*SupportContact +func SupportContactFromInstanceArray(fromArray []*apiv1.ResourceInstance) ([]*SupportContact, error) { + newArray := make([]*SupportContact, 0) + for _, item := range fromArray { + res := &SupportContact{} + err := res.FromInstance(item) + if err != nil { + return make([]*SupportContact, 0), err + } + newArray = append(newArray, res) + } + + return newArray, nil +} + +// AsInstance converts a SupportContact to a ResourceInstance +func (res *SupportContact) AsInstance() (*apiv1.ResourceInstance, error) { + meta := res.ResourceMeta + meta.GroupVersionKind = SupportContactGVK() + res.ResourceMeta = meta + + m, err := json.Marshal(res) + if err != nil { + return nil, err + } + + instance := apiv1.ResourceInstance{} + err = json.Unmarshal(m, &instance) + if err != nil { + return nil, err + } + + return &instance, nil +} + +// FromInstance converts a ResourceInstance to a SupportContact +func (res *SupportContact) FromInstance(ri *apiv1.ResourceInstance) error { + if ri == nil { + res = nil + return nil + } + var err error + rawResource := ri.GetRawResource() + if rawResource == nil { + rawResource, err = json.Marshal(ri) + if err != nil { + return err + } + } + err = json.Unmarshal(rawResource, res) + return err +} + +// MarshalJSON custom marshaller to handle sub resources +func (res *SupportContact) MarshalJSON() ([]byte, error) { + m, err := json.Marshal(&res.ResourceMeta) + if err != nil { + return nil, err + } + + var out map[string]interface{} + err = json.Unmarshal(m, &out) + if err != nil { + return nil, err + } + + out["owner"] = res.Owner + out["spec"] = res.Spec + + return json.Marshal(out) +} + +// UnmarshalJSON custom unmarshaller to handle sub resources +func (res *SupportContact) UnmarshalJSON(data []byte) error { + var err error + + aux := &apiv1.ResourceInstance{} + err = json.Unmarshal(data, aux) + if err != nil { + return err + } + + res.ResourceMeta = aux.ResourceMeta + res.Owner = aux.Owner + + // ResourceInstance holds the spec as a map[string]interface{}. + // Convert it to bytes, then convert to the spec type for the resource. + sr, err := json.Marshal(aux.Spec) + if err != nil { + return err + } + + err = json.Unmarshal(sr, &res.Spec) + if err != nil { + return err + } + + return nil +} + +// PluralName returns the plural name of the resource +func (res *SupportContact) PluralName() string { + return SupportContactResourceName +} diff --git a/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go index 92e819e9f..f9482cd56 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go @@ -9,7 +9,7 @@ package catalog -// CategorySpec (catalog.v1.Category) +// CategorySpec struct for CategorySpec type CategorySpec struct { // Markdown representing the category description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go index 336f04436..1328d58fd 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpec (catalog.v1.Document) +// DocumentSpec struct for DocumentSpec type DocumentSpec struct { // Document description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go b/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go index 381c0bc6a..dc76a182e 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpecSections (catalog.v1.Document) +// DocumentSpecSections struct for DocumentSpecSections type DocumentSpecSections struct { // Title for the section. Title string `json:"title"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_status.go b/pkg/apic/apiserver/models/catalog/v1/model_document_status.go index b3b6a30b6..e3ca9d297 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_status.go @@ -9,7 +9,7 @@ package catalog -// DocumentStatus (catalog.v1.Document) +// DocumentStatus struct for DocumentStatus type DocumentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go index 5d8b8ec06..e001632b3 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go @@ -9,7 +9,7 @@ package catalog -// MarketplaceSpec (catalog.v1.Marketplace) +// MarketplaceSpec struct for MarketplaceSpec type MarketplaceSpec struct { // description of the Marketplace. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go index 1c5041690..b39e2c608 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpec (catalog.v1.ProductOverview) +// ProductOverviewSpec struct for ProductOverviewSpec type ProductOverviewSpec struct { // Defines all the documents and order for marketplace. Documents []ProductOverviewSpecDocuments `json:"documents,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go index 33486d386..3b1abe808 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpecDocuments (catalog.v1.ProductOverview) +// ProductOverviewSpecDocuments struct for ProductOverviewSpecDocuments type ProductOverviewSpecDocuments struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references.go index 74825be08..69d5c933e 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references.go @@ -9,7 +9,7 @@ package catalog -// ProductReferences (catalog.v1.Product) +// ProductReferences struct for ProductReferences type ProductReferences struct { // Computed latest AssetReleases for each Asset reference in the Product. Assets []ProductReferencesAssets `json:"assets,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go index ea8c765c2..cfc2bb3c8 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesAssets (catalog.v1.Product) +// ProductReferencesAssets struct for ProductReferencesAssets type ProductReferencesAssets struct { // The Asset reference. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go index 53e89259e..bf0e1e94a 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesRelease (catalog.v1.Product) +// ProductReferencesRelease struct for ProductReferencesRelease type ProductReferencesRelease struct { // The latest AssetRelease computed based on the provided Asset filters. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go index d29f639d0..abd7fdebe 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpec (catalog.v1.ProductRelease) +// ProductReleaseSpec struct for ProductReleaseSpec type ProductReleaseSpec struct { // Description of the release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go index 661ad7f5b..a51f0ef6a 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecAssets (catalog.v1.ProductRelease) +// ProductReleaseSpecAssets struct for ProductReleaseSpecAssets type ProductReleaseSpecAssets struct { // The Asset name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go index d7d6f9f9a..510c432c0 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecRelease (catalog.v1.ProductRelease) +// ProductReleaseSpecRelease struct for ProductReleaseSpecRelease type ProductReleaseSpecRelease struct { Name string `json:"name,omitempty"` // The AssetRelease version. diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go index 1fc463896..d8232a485 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseStatus (catalog.v1.ProductRelease) +// ProductReleaseStatus struct for ProductReleaseStatus type ProductReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go index ebe424a75..ae74d3554 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go @@ -22,6 +22,6 @@ type ProductReleaseStatusError struct { // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go index 88abde487..4fdfbd19b 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go @@ -22,6 +22,6 @@ type ProductReleaseStatusPending struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // Reason for being in Pending. - Detail string `json:"detail"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go deleted file mode 100644 index a266aa28b..000000000 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go +++ /dev/null @@ -1,16 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -// ProductReleaseStatusPendingMeta struct for ProductReleaseStatusPendingMeta -type ProductReleaseStatusPendingMeta struct { - Asset string `json:"asset,omitempty"` - AssetRelease string `json:"assetRelease,omitempty"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go index 7b9c12a6a..cc3fa3cca 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go @@ -22,6 +22,6 @@ type ProductReleaseStatusSuccess struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // message of the result - Detail string `json:"detail"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go index c753aaf58..8e1df7ed8 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go @@ -9,11 +9,13 @@ package catalog -// ProductSpec (catalog.v1.Product) +// ProductSpec struct for ProductSpec type ProductSpec struct { // description of the Product. - Description string `json:"description,omitempty"` - Categories []string `json:"categories,omitempty"` + Description string `json:"description,omitempty"` + SupportContact string `json:"supportContact,omitempty"` + Categories []string `json:"categories,omitempty"` // Defines all the Assets that the Product will be built from. - Assets []ProductSpecAssets `json:"assets,omitempty"` + Assets []ProductSpecAssets `json:"assets,omitempty"` + AutoRelease ProductSpecAutoRelease `json:"autoRelease,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go index 141e6ce23..863bd4440 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAssets (catalog.v1.Product) +// ProductSpecAssets struct for ProductSpecAssets type ProductSpecAssets struct { Name string `json:"name"` Filters ProductSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go similarity index 55% rename from pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go rename to pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go index 563e3aec9..b07c3f31b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go @@ -9,8 +9,7 @@ package catalog -// CredentialMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Credential) -type CredentialMarketplaceResourceOwnerOrganization struct { - // Id of the organization. - Id string `json:"id"` +// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. +type ProductSpecAutoRelease struct { + ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go index 9647bf14c..91b2c87f4 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecFilters Filters what AssetRelease the Product points to. (catalog.v1.Product) +// ProductSpecFilters Filters what AssetRelease the Product points to. type ProductSpecFilters struct { // The AssetRelease version to use. Examples: - 1.0.1 for a specific asset release version - 1.* for all minor and patch versions of version 1 - 1.2.* for all the patch version for version 1.2 Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status.go index 8a5011dd7..39e077949 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status.go @@ -9,7 +9,7 @@ package catalog -// ProductStatus (catalog.v1.Product) +// ProductStatus struct for ProductStatus type ProductStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go index 1995ca32c..c1c997094 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go @@ -9,7 +9,7 @@ package catalog -// ProductStatusMeta (catalog.v1.Product) +// ProductStatusMeta struct for ProductStatusMeta type ProductStatusMeta struct { Asset string `json:"asset,omitempty"` AssetRelease string `json:"assetRelease,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go index b20999f23..596b9572d 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ProductStatusReasons (catalog.v1.Product) +// ProductStatusReasons struct for ProductStatusReasons type ProductStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go index ea55d8e2c..275facb58 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go @@ -9,7 +9,7 @@ package catalog -// QuotaSpec (catalog.v1.Quota) +// QuotaSpec struct for QuotaSpec type QuotaSpec struct { // description of the quota. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_loose_overages.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_loose_overages.go index d0b041c09..ef05c8c1f 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_loose_overages.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_loose_overages.go @@ -12,6 +12,5 @@ package catalog // QuotaSpecLimitTypeLooseOverages struct for QuotaSpecLimitTypeLooseOverages type QuotaSpecLimitTypeLooseOverages struct { // The overage price per unit. - // GENERATE: The following code has been modified after code generation Value float64 `json:"value,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_tiered_tiers.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_tiered_tiers.go index 3c15afe37..1db4a86a5 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_tiered_tiers.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec_limit_type_tiered_tiers.go @@ -16,9 +16,7 @@ type QuotaSpecLimitTypeTieredTiers struct { // The limit end of the tier provided. To int32 `json:"to"` // The tier price. - // GENERATE: The following code has been modified after code generation Cost float64 `json:"cost"` // The flat fee for the tier. - // GENERATE: The following code has been modified after code generation FlatFee float64 `json:"flatFee"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go index 8717dd9d7..862b00157 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go @@ -9,7 +9,7 @@ package catalog -// QuotaStatus (catalog.v1.Quota) +// QuotaStatus struct for QuotaStatus type QuotaStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go index 474f4dfda..7c747ce96 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// ResourceSpec (catalog.v1.Resource) +// ResourceSpec struct for ResourceSpec type ResourceSpec struct { // The type of the resource, example: pdf FileType string `json:"fileType"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go new file mode 100644 index 000000000..8f3b46375 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go @@ -0,0 +1,18 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SupportContactSpec struct for SupportContactSpec +type SupportContactSpec struct { + // Email address of the Support Contact. + Email string `json:"email"` + // String of the E.164 format of the phone number, e.g. +11234567899 + PhoneNumber string `json:"phoneNumber,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/AccessControlList.go b/pkg/apic/apiserver/models/catalog/v1alpha1/AccessControlList.go index fde36400e..ef26dc6b1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/AccessControlList.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/AccessControlList.go @@ -20,7 +20,7 @@ var ( APIVersion: "v1alpha1", } - AccessControlListScopes = []string{"Application", "Asset", "AssetRelease", "AuthorizationProfile", "Category", "Marketplace", "Product", "ProductPlan", "ProductPlanUnit", "ProductRelease", "Stage", "Subscription"} + AccessControlListScopes = []string{"Application", "Asset", "AssetRelease", "AuthorizationProfile", "Category", "Marketplace", "Product", "ProductPlan", "ProductPlanUnit", "ProductRelease", "Stage", "Subscription", "SupportContact"} ) const AccessControlListResourceName = "accesscontrollists" diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/AssetRequest.go b/pkg/apic/apiserver/models/catalog/v1alpha1/AssetRequest.go index 0a262b350..ecca6a5c0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/AssetRequest.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/AssetRequest.go @@ -35,12 +35,13 @@ func init() { // AssetRequest Resource type AssetRequest struct { apiv1.ResourceMeta - Approval AssetRequestApproval `json:"approval"` - Data interface{} `json:"data"` - Owner *apiv1.Owner `json:"owner"` - References AssetRequestReferences `json:"references"` - Spec AssetRequestSpec `json:"spec"` - // Status AssetRequestStatus `json:"status"` + Approval AssetRequestApproval `json:"approval"` + Data interface{} `json:"data"` + Marketplace AssetRequestMarketplace `json:"marketplace"` + Owner *apiv1.Owner `json:"owner"` + References AssetRequestReferences `json:"references"` + Spec AssetRequestSpec `json:"spec"` + // Status AssetRequestStatus `json:"status"` Status *apiv1.ResourceStatus `json:"status"` } @@ -128,6 +129,7 @@ func (res *AssetRequest) MarshalJSON() ([]byte, error) { out["approval"] = res.Approval out["data"] = res.Data + out["marketplace"] = res.Marketplace out["owner"] = res.Owner out["references"] = res.References out["spec"] = res.Spec @@ -189,6 +191,20 @@ func (res *AssetRequest) UnmarshalJSON(data []byte) error { } } + // marshalling subresource Marketplace + if v, ok := aux.SubResources["marketplace"]; ok { + sr, err = json.Marshal(v) + if err != nil { + return err + } + + delete(aux.SubResources, "marketplace") + err = json.Unmarshal(sr, &res.Marketplace) + if err != nil { + return err + } + } + // marshalling subresource References if v, ok := aux.SubResources["references"]; ok { sr, err = json.Marshal(v) diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/SupportContact.go b/pkg/apic/apiserver/models/catalog/v1alpha1/SupportContact.go new file mode 100644 index 000000000..9212bd158 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/SupportContact.go @@ -0,0 +1,155 @@ +/* + * This file is automatically generated + */ + +package catalog + +import ( + "encoding/json" + + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +var ( + _SupportContactGVK = apiv1.GroupVersionKind{ + GroupKind: apiv1.GroupKind{ + Group: "catalog", + Kind: "SupportContact", + }, + APIVersion: "v1alpha1", + } + + SupportContactScopes = []string{""} +) + +const SupportContactResourceName = "supportcontacts" + +func SupportContactGVK() apiv1.GroupVersionKind { + return _SupportContactGVK +} + +func init() { + apiv1.RegisterGVK(_SupportContactGVK, SupportContactScopes[0], SupportContactResourceName) +} + +// SupportContact Resource +type SupportContact struct { + apiv1.ResourceMeta + Owner *apiv1.Owner `json:"owner"` + Spec SupportContactSpec `json:"spec"` +} + +// NewSupportContact creates an empty *SupportContact +func NewSupportContact(name string) *SupportContact { + return &SupportContact{ + ResourceMeta: apiv1.ResourceMeta{ + Name: name, + GroupVersionKind: _SupportContactGVK, + }, + } +} + +// SupportContactFromInstanceArray converts a []*ResourceInstance to a []*SupportContact +func SupportContactFromInstanceArray(fromArray []*apiv1.ResourceInstance) ([]*SupportContact, error) { + newArray := make([]*SupportContact, 0) + for _, item := range fromArray { + res := &SupportContact{} + err := res.FromInstance(item) + if err != nil { + return make([]*SupportContact, 0), err + } + newArray = append(newArray, res) + } + + return newArray, nil +} + +// AsInstance converts a SupportContact to a ResourceInstance +func (res *SupportContact) AsInstance() (*apiv1.ResourceInstance, error) { + meta := res.ResourceMeta + meta.GroupVersionKind = SupportContactGVK() + res.ResourceMeta = meta + + m, err := json.Marshal(res) + if err != nil { + return nil, err + } + + instance := apiv1.ResourceInstance{} + err = json.Unmarshal(m, &instance) + if err != nil { + return nil, err + } + + return &instance, nil +} + +// FromInstance converts a ResourceInstance to a SupportContact +func (res *SupportContact) FromInstance(ri *apiv1.ResourceInstance) error { + if ri == nil { + res = nil + return nil + } + var err error + rawResource := ri.GetRawResource() + if rawResource == nil { + rawResource, err = json.Marshal(ri) + if err != nil { + return err + } + } + err = json.Unmarshal(rawResource, res) + return err +} + +// MarshalJSON custom marshaller to handle sub resources +func (res *SupportContact) MarshalJSON() ([]byte, error) { + m, err := json.Marshal(&res.ResourceMeta) + if err != nil { + return nil, err + } + + var out map[string]interface{} + err = json.Unmarshal(m, &out) + if err != nil { + return nil, err + } + + out["owner"] = res.Owner + out["spec"] = res.Spec + + return json.Marshal(out) +} + +// UnmarshalJSON custom unmarshaller to handle sub resources +func (res *SupportContact) UnmarshalJSON(data []byte) error { + var err error + + aux := &apiv1.ResourceInstance{} + err = json.Unmarshal(data, aux) + if err != nil { + return err + } + + res.ResourceMeta = aux.ResourceMeta + res.Owner = aux.Owner + + // ResourceInstance holds the spec as a map[string]interface{}. + // Convert it to bytes, then convert to the spec type for the resource. + sr, err := json.Marshal(aux.Spec) + if err != nil { + return err + } + + err = json.Unmarshal(sr, &res.Spec) + if err != nil { + return err + } + + return nil +} + +// PluralName returns the plural name of the resource +func (res *SupportContact) PluralName() string { + return SupportContactResourceName +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scope.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scope.go index 4bddca348..a9cb7ac88 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scope.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scope.go @@ -13,4 +13,10 @@ package catalog type AccessControlListSpecAccessLevelScope struct { // Resource level at which access is being granted. Level string `json:"level,omitempty"` + // Set true to allow users to create scoped resources. + AllowCreateScoped bool `json:"allowCreateScoped,omitempty"` + // Set true to allow users to delete the unscoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the unscoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go index d50cfeb21..8730f7735 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go @@ -15,4 +15,10 @@ type AccessControlListSpecAccessLevelScopedKind struct { Level string `json:"level,omitempty"` // The kind of scoped resources to provide access to or \"*\" for all kinds. Kind string `json:"kind"` + // Set true to allow users to create scoped resources of the specified kind. + AllowCreate bool `json:"allowCreate,omitempty"` + // Set true to allow users to delete scoped resources of the specified kind. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update scoped resources of the specified kind. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go index 309e2c661..0e0433702 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go @@ -17,4 +17,8 @@ type AccessControlListSpecAccessLevelScopedResource struct { Kind string `json:"kind"` // The name of the scoped resource to provide access to. Name string `json:"name"` + // Set true to allow users to delete the referenced scoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the referenced scoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go index 7dab20979..d957e3da2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package catalog -// AccessControlListSpecRules (catalog.v1alpha1.AccessControlList) +// AccessControlListSpecRules struct for AccessControlListSpecRules type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go index 1f73b84a1..09469555e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package catalog -// AccessControlListSpecSubjects (catalog.v1alpha1.AccessControlList) +// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go index 9c02812fb..93534b524 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplace Details about the marketplace Application. (catalog.v1alpha1.Application) +// ApplicationMarketplace Details about the marketplace Application. type ApplicationMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go index 6b19e85e7..601785720 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResource The Marketplace Application resource details. (catalog.v1alpha1.Application) +// ApplicationMarketplaceResource The Marketplace Application resource details. type ApplicationMarketplaceResource struct { Metadata ApplicationMarketplaceResourceMetadata `json:"metadata"` Owner ApplicationMarketplaceResourceOwner `json:"owner,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go index 8a001ca36..f751e98d3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Application) +// ApplicationMarketplaceResourceMetadata Marketplace Application metadata. type ApplicationMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go index fb06fc6bd..d35b48543 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceOwner Owner of the Application. (catalog.v1alpha1.Application) +// ApplicationMarketplaceResourceOwner Owner of the Application. type ApplicationMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go index 516b8591b..da28704e1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Application) +// ApplicationMarketplaceResourceOwnerOrganization Organization details. type ApplicationMarketplaceResourceOwnerOrganization struct { // Id of the organization. Id string `json:"id"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go index 9c9677263..d599e1813 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go @@ -9,7 +9,7 @@ package catalog -// ApplicationSpec (catalog.v1alpha1.Application) +// ApplicationSpec struct for ApplicationSpec type ApplicationSpec struct { Security ApplicationSpecSecurity `json:"security"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go index 2c058df42..f10a3c4e7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go @@ -9,7 +9,7 @@ package catalog -// ApplicationSpecSecurity (catalog.v1alpha1.Application) +// ApplicationSpecSecurity struct for ApplicationSpecSecurity type ApplicationSpecSecurity struct { // public key to be used to encrypt the credentials linked to this Application. EncryptionKey string `json:"encryptionKey"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go index 5e731e7b2..70e87e908 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go @@ -9,7 +9,7 @@ package catalog -// AssetAccess Defines how an asset should handle access requests received from marketplace consumers. (catalog.v1alpha1.Asset) +// AssetAccess Defines how an asset should handle access requests received from marketplace consumers. type AssetAccess struct { Approval string `json:"approval"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go index 59d403883..2613b96f1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingSpec (catalog.v1alpha1.AssetMapping) +// AssetMappingSpec struct for AssetMappingSpec type AssetMappingSpec struct { // Reference to the executed AssetMappingTemplate. AssetMappingTemplate string `json:"assetMappingTemplate,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go index e81212fe5..2b6c8c2f4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingSpecInputs The list of the inputs provided to the template. (catalog.v1alpha1.AssetMapping) +// AssetMappingSpecInputs The list of the inputs provided to the template. type AssetMappingSpecInputs struct { ApiService string `json:"apiService"` ApiServiceRevision string `json:"apiServiceRevision,omitempty"` @@ -18,4 +18,6 @@ type AssetMappingSpecInputs struct { Stage string `json:"stage,omitempty"` // list of categories for the asset. Categories []string `json:"categories,omitempty"` + // title for generated asset resource. + AssetResourceTitle string `json:"assetResourceTitle,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go index a007d7509..a8b1c1a98 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatus (catalog.v1alpha1.AssetMapping) +// AssetMappingStatus struct for AssetMappingStatus type AssetMappingStatus struct { Level string `json:"level,omitempty"` Source AssetMappingStatusSource `json:"source,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go index 04703b2f2..6bd0496c6 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusOutputs (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusOutputs struct for AssetMappingStatusOutputs type AssetMappingStatusOutputs struct { Resource AssetMappingStatusResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go index 6b8996161..923b90d94 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. type AssetMappingStatusResource struct { AssetResource AssetMappingStatusResourceAssetResource `json:"assetResource,omitempty"` Stage AssetMappingStatusResourceStage `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go index b9499b7c9..12a5631c0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResourceAssetResource (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusResourceAssetResource struct for AssetMappingStatusResourceAssetResource type AssetMappingStatusResourceAssetResource struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go index f65e70600..71d522cc9 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResourceStage (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusResourceStage struct for AssetMappingStatusResourceStage type AssetMappingStatusResourceStage struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go index 8dd93b24d..bcfc74fa8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSource (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSource struct for AssetMappingStatusSource type AssetMappingStatusSource struct { Resource AssetMappingStatusSourceResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go index 4e19eb09f..8ed5da71c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. type AssetMappingStatusSourceResource struct { ApiService AssetMappingStatusSourceResourceApiService `json:"apiService,omitempty"` ApiServiceRevision AssetMappingStatusSourceResourceApiServiceRevision `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go index 17cacf60a..d9c40587e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiService (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiService struct for AssetMappingStatusSourceResourceApiService type AssetMappingStatusSourceResourceApiService struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go index 4c47fb7df..d0963c5cc 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiServiceInstance (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiServiceInstance struct for AssetMappingStatusSourceResourceApiServiceInstance type AssetMappingStatusSourceResourceApiServiceInstance struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go index 0946c0f4c..4b44099a7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiServiceRevision (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiServiceRevision struct for AssetMappingStatusSourceResourceApiServiceRevision type AssetMappingStatusSourceResourceApiServiceRevision struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go index a6564cd67..18b81387c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceAssetMappingTemplate (catalog.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceAssetMappingTemplate struct for AssetMappingStatusSourceResourceAssetMappingTemplate type AssetMappingStatusSourceResourceAssetMappingTemplate struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go index 10712c9ee..068947ff3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseSpec (catalog.v1alpha1.AssetRelease) +// AssetReleaseSpec struct for AssetReleaseSpec type AssetReleaseSpec struct { // Description of the asset release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go index 656825e2d..1dcd4b01c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseStatus (catalog.v1alpha1.AssetRelease) +// AssetReleaseStatus struct for AssetReleaseStatus type AssetReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go index c1806fa32..48b7f1072 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseStatusMeta (catalog.v1alpha1.AssetRelease) +// AssetReleaseStatusMeta struct for AssetReleaseStatusMeta type AssetReleaseStatusMeta struct { AssetResource string `json:"assetResource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go index aa8c04b67..2b3c6ffdd 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AssetReleaseStatusReasons (catalog.v1alpha1.AssetRelease) +// AssetReleaseStatusReasons struct for AssetReleaseStatusReasons type AssetReleaseStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go index b58dd1f69..94aa74349 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestApproval (catalog.v1alpha1.AssetRequest) +// AssetRequestApproval struct for AssetRequestApproval type AssetRequestApproval struct { State AssetRequestApprovalState `json:"state"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go index 56ef1a900..d8c2a4006 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestApprovalState (catalog.v1alpha1.AssetRequest) +// AssetRequestApprovalState struct for AssetRequestApprovalState type AssetRequestApprovalState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go index e9a1d3850..eec888051 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestDefinitionAuthorization (catalog.v1alpha1.AssetRequestDefinition) +// AssetRequestDefinitionAuthorization struct for AssetRequestDefinitionAuthorization type AssetRequestDefinitionAuthorization struct { Approval string `json:"approval"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go index 7b0e0dadb..6b478f28e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go @@ -9,9 +9,9 @@ package catalog -// AssetRequestDefinitionSpec (catalog.v1alpha1.AssetRequestDefinition) +// AssetRequestDefinitionSpec struct for AssetRequestDefinitionSpec type AssetRequestDefinitionSpec struct { - // JSON Schema draft \\#7 for defining the AssetRequest properties needed to get access to an APIServiceInstance. (catalog.v1alpha1.AssetRequestDefinition) + // JSON Schema draft \\#7 for defining the AssetRequest properties needed to get access to an APIServiceInstance. Schema map[string]interface{} `json:"schema"` Provision AssetRequestDefinitionSpecProvision `json:"provision,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go index b67798afc..752bb6c78 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go @@ -9,8 +9,8 @@ package catalog -// AssetRequestDefinitionSpecProvision (catalog.v1alpha1.AssetRequestDefinition) +// AssetRequestDefinitionSpecProvision struct for AssetRequestDefinitionSpecProvision type AssetRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. (catalog.v1alpha1.AssetRequestDefinition) + // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. Schema map[string]interface{} `json:"schema"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_asset_resource_ref.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go similarity index 50% rename from pkg/apic/apiserver/models/catalog/v1/model_document_spec_asset_resource_ref.go rename to pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go index 642cc0cff..5e46b2cc3 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_asset_resource_ref.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go @@ -9,10 +9,9 @@ package catalog -// DocumentSpecAssetResourceRef struct for DocumentSpecAssetResourceRef -type DocumentSpecAssetResourceRef struct { - Kind string `json:"kind"` - Name string `json:"name,omitempty"` - // Title for the article. - Title string `json:"title"` +// AssetRequestMarketplace Details about the marketplace Access Request. +type AssetRequestMarketplace struct { + // The name of the Marketplace. + Name string `json:"name"` + Resource AssetRequestMarketplaceResource `json:"resource"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go new file mode 100644 index 000000000..31c20b5c1 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// AssetRequestMarketplaceResource The Marketplace Access Request resource details. +type AssetRequestMarketplaceResource struct { + Metadata AssetRequestMarketplaceResourceMetadata `json:"metadata"` + Owner AssetRequestMarketplaceResourceOwner `json:"owner,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go similarity index 74% rename from pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go rename to pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go index d40484f04..a28118b30 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go @@ -9,8 +9,8 @@ package catalog -// CredentialMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Credential) -type CredentialMarketplaceResourceMetadata struct { +// AssetRequestMarketplaceResourceMetadata Marketplace Access Request metadata. +type AssetRequestMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` // Id of the user that created the entity. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go similarity index 53% rename from pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go rename to pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go index a165aef62..9e90f53c4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go @@ -9,11 +9,11 @@ package catalog -// SubscriptionMarketplaceResourceOwner Owner of the Application. (catalog.v1alpha1.Subscription) -type SubscriptionMarketplaceResourceOwner struct { +// AssetRequestMarketplaceResourceOwner Owner of the Access Request. +type AssetRequestMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` // Id of the owner of the resource. - Id string `json:"id,omitempty"` - Organization SubscriptionMarketplaceResourceOwnerOrganization `json:"organization"` + Id string `json:"id,omitempty"` + Organization ApplicationMarketplaceResourceOwnerOrganization `json:"organization"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go index debe8b08d..5e386ec36 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestReferences (catalog.v1alpha1.AssetRequest) +// AssetRequestReferences struct for AssetRequestReferences type AssetRequestReferences struct { AssetRequestDefinition string `json:"assetRequestDefinition,omitempty"` // Reference to Release that got created from this asset request. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go index b576cbd98..6726ac3f4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go @@ -9,9 +9,8 @@ package catalog -// AssetRequestSpec (catalog.v1alpha1.AssetRequest) +// AssetRequestSpec struct for AssetRequestSpec type AssetRequestSpec struct { - // (catalog.v1alpha1.AssetRequest) Data map[string]interface{} `json:"data"` AssetResource string `json:"assetResource"` // reference to the Subscription to be used to access the Asset Resource. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go index 10e401bd1..229290730 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go @@ -9,10 +9,10 @@ package catalog -// AssetRequestStatus (catalog.v1alpha1.AssetRequest) +// AssetRequestStatus struct for AssetRequestStatus type AssetRequestStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []AssetRequestStatusReasons `json:"reasons,omitempty"` + Reasons []SubscriptionStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go deleted file mode 100644 index cf802a3c7..000000000 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go +++ /dev/null @@ -1,28 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -import ( - // GENERATE: The following code has been modified after code generation - // - // "time" - time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" -) - -// AssetRequestStatusReasons (catalog.v1alpha1.AssetRequest) -type AssetRequestStatusReasons struct { - Type string `json:"type"` - // Details of the error. - Detail string `json:"detail"` - // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (catalog.v1alpha1.AssetRequest) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go index f102e9bdc..94b81f607 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceReferences (catalog.v1alpha1.AssetResource) +// AssetResourceReferences struct for AssetResourceReferences type AssetResourceReferences struct { // Reference to API Service Revision resource ApiServiceRevision string `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go index 0f88c667f..0038e1ab6 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceSpec (catalog.v1alpha1.AssetResource) +// AssetResourceSpec struct for AssetResourceSpec type AssetResourceSpec struct { // The Stage this Asset Resource is deployed on. Stage string `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go index eb63164ec..7ba1b10e1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceSpecAccessInfo (catalog.v1alpha1.AssetResource) +// AssetResourceSpecAccessInfo struct for AssetResourceSpecAccessInfo type AssetResourceSpecAccessInfo struct { // url where the definition can be accessed. Url string `json:"url,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go index 26996ee16..bfd318be8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go @@ -9,11 +9,12 @@ package catalog -// AssetSpec (catalog.v1alpha1.Asset) +// AssetSpec struct for AssetSpec type AssetSpec struct { // description of the asset. Description string `json:"description,omitempty"` Type string `json:"type"` // list of categories for the asset. - Categories []string `json:"categories,omitempty"` + Categories []string `json:"categories,omitempty"` + AutoRelease AssetSpecAutoRelease `json:"autoRelease,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go similarity index 54% rename from pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go rename to pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go index 734ee4b1b..919d5c104 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go @@ -9,8 +9,7 @@ package catalog -// SubscriptionMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Subscription) -type SubscriptionMarketplaceResourceOwnerOrganization struct { - // Id of the organization. - Id string `json:"id"` +// AssetSpecAutoRelease Defines if an asset should create releases everytime there is an update to the resources. +type AssetSpecAutoRelease struct { + ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go index 9a69b183a..002a38b35 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go @@ -9,7 +9,7 @@ package catalog -// AssetStatus (catalog.v1alpha1.Asset) +// AssetStatus struct for AssetStatus type AssetStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go index 499513f5d..63785466c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go @@ -9,7 +9,7 @@ package catalog -// AssetStatusMeta (catalog.v1alpha1.Asset) +// AssetStatusMeta struct for AssetStatusMeta type AssetStatusMeta struct { AssetResource string `json:"assetResource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go index 3b6b1dfe6..cc02af012 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AssetStatusReasons (catalog.v1alpha1.Asset) +// AssetStatusReasons struct for AssetStatusReasons type AssetStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go index e55014086..6f3650d47 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go @@ -9,7 +9,7 @@ package catalog -// AuthorizationProfileReferences (catalog.v1alpha1.AuthorizationProfile) +// AuthorizationProfileReferences struct for AuthorizationProfileReferences type AuthorizationProfileReferences struct { Environment string `json:"environment,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go index 41d52b015..5063a8b10 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go @@ -9,7 +9,7 @@ package catalog -// AuthorizationProfileSpec (catalog.v1alpha1.AuthorizationProfile) +// AuthorizationProfileSpec struct for AuthorizationProfileSpec type AuthorizationProfileSpec struct { // Description of AuthorizationProfile that can be used to access Asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go index 72b45103e..f9482cd56 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go @@ -9,7 +9,7 @@ package catalog -// CategorySpec (catalog.v1alpha1.Category) +// CategorySpec struct for CategorySpec type CategorySpec struct { // Markdown representing the category description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go index b2e07eb5c..19e15c073 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go @@ -9,7 +9,7 @@ package catalog -// CredentialMarketplace Details about the marketplace Application. (catalog.v1alpha1.Credential) +// CredentialMarketplace Details about the marketplace Application. type CredentialMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go index 6e047edbe..1b2bcf1b5 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go @@ -9,8 +9,8 @@ package catalog -// CredentialMarketplaceResource The Marketplace Credential resource details. (catalog.v1alpha1.Credential) +// CredentialMarketplaceResource The Marketplace Credential resource details. type CredentialMarketplaceResource struct { - Metadata CredentialMarketplaceResourceMetadata `json:"metadata"` - Owner CredentialMarketplaceResourceOwner `json:"owner,omitempty"` + Metadata ApplicationMarketplaceResourceMetadata `json:"metadata"` + Owner CredentialMarketplaceResourceOwner `json:"owner,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go index cbe69ef66..ec2c3a98c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go @@ -9,11 +9,11 @@ package catalog -// CredentialMarketplaceResourceOwner Owner of the Credential. (catalog.v1alpha1.Credential) +// CredentialMarketplaceResourceOwner Owner of the Credential. type CredentialMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` // Id of the owner of the resource. - Id string `json:"id,omitempty"` - Organization CredentialMarketplaceResourceOwnerOrganization `json:"organization"` + Id string `json:"id,omitempty"` + Organization ApplicationMarketplaceResourceOwnerOrganization `json:"organization"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go index 6f68497f2..8d45d48c9 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go @@ -9,7 +9,7 @@ package catalog -// CredentialPolicies (catalog.v1alpha1.Credential) +// CredentialPolicies struct for CredentialPolicies type CredentialPolicies struct { Expiry CredentialPoliciesExpiry `json:"expiry,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go index 165893009..c3d590bb7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialPoliciesExpiry (catalog.v1alpha1.Credential) +// CredentialPoliciesExpiry struct for CredentialPoliciesExpiry type CredentialPoliciesExpiry struct { // Time when the Credential is set to be expired. Timestamp time.Time `json:"timestamp"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go index 9b654f289..43ddd661b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go @@ -9,7 +9,7 @@ package catalog -// CredentialReferences (catalog.v1alpha1.Credential) +// CredentialReferences struct for CredentialReferences type CredentialReferences struct { // Reference to the Credential for managed app that got created from this catalog credential. Credential string `json:"credential,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go index ff78127ca..cef5f937f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionReferences (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionReferences struct for CredentialRequestDefinitionReferences type CredentialRequestDefinitionReferences struct { // The name of the CredentialRequestDefinition from an Environment. CredentialReqDef string `json:"credentialReqDef,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go index 02b3b8853..8d35b84ae 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go @@ -9,9 +9,9 @@ package catalog -// CredentialRequestDefinitionSpec (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpec struct for CredentialRequestDefinitionSpec type CredentialRequestDefinitionSpec struct { - // JSON Schema draft \\#7 for describing the fields needed to provision Credentials of that type. (catalog.v1alpha1.CredentialRequestDefinition) + // JSON Schema draft \\#7 for describing the fields needed to provision Credentials of that type. Schema map[string]interface{} `json:"schema"` Provision CredentialRequestDefinitionSpecProvision `json:"provision"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go index 419817656..5014da807 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go @@ -9,9 +9,9 @@ package catalog -// CredentialRequestDefinitionSpecProvision (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvision struct for CredentialRequestDefinitionSpecProvision type CredentialRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the generated credentials format. (catalog.v1alpha1.CredentialRequestDefinition) + // JSON Schema draft \\#7 for describing the generated credentials format. Schema map[string]interface{} `json:"schema"` Policies CredentialRequestDefinitionSpecProvisionPolicies `json:"policies,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go index e34cac0b0..1a9001008 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPolicies Defines the policies applied on the Credentials generated using this definition. (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvisionPolicies Defines the policies applied on the Credentials generated using this definition. type CredentialRequestDefinitionSpecProvisionPolicies struct { // Defines on if Credentials using this definitions can be renewed. Renewable bool `json:"renewable,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go index e5d079ac3..a016f598f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. type CredentialRequestDefinitionSpecProvisionPoliciesExpiry struct { // The number of days after the Credentials are considered to be expired. Period int32 `json:"period"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go index 14cdde9cd..88c524037 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions (catalog.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct for CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions type CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct { // The type of the action taken when the Credential using this definition expires. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go index 376c1f473..111b8634c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go @@ -9,11 +9,11 @@ package catalog -// CredentialSpec (catalog.v1alpha1.Credential) +// CredentialSpec struct for CredentialSpec type CredentialSpec struct { // Reference to Credential Request Definition resource CredentialRequestDefinition string `json:"credentialRequestDefinition"` - // data matching the credential request definition schema. (catalog.v1alpha1.Credential) + // data matching the credential request definition schema. Data map[string]interface{} `json:"data"` State CredentialSpecState `json:"state,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go index cb1a00d7e..d8d162c7a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go @@ -9,11 +9,11 @@ package catalog -// CredentialSpecState Desired state of the Credential. (catalog.v1alpha1.Credential) +// CredentialSpecState Desired state of the Credential. type CredentialSpecState struct { Name string `json:"name"` // Additional info on the state. Reason string `json:"reason,omitempty"` - // Additional info on the state. + // Defines if credential needs to be rotated. Rotate bool `json:"rotate,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go index 824ce0e2a..ce422236e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go @@ -9,7 +9,7 @@ package catalog -// CredentialState Current state of the Credential. (catalog.v1alpha1.Credential) +// CredentialState Current state of the Credential. type CredentialState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go index c82ece980..3a4bfa84c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go @@ -9,7 +9,7 @@ package catalog -// CredentialStatus (catalog.v1alpha1.Credential) +// CredentialStatus struct for CredentialStatus type CredentialStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go index 03b9859ae..75bdaf604 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go @@ -16,14 +16,13 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialStatusReasons (catalog.v1alpha1.Credential) +// CredentialStatusReasons struct for CredentialStatusReasons type CredentialStatusReasons struct { // type of the reason. Type string `json:"type"` // Details of the type. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (catalog.v1alpha1.Credential) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go index 740a11703..1328d58fd 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpec (catalog.v1alpha1.Document) +// DocumentSpec struct for DocumentSpec type DocumentSpec struct { // Document description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_asset_resource_ref.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_asset_resource_ref.go deleted file mode 100644 index 642cc0cff..000000000 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_asset_resource_ref.go +++ /dev/null @@ -1,18 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -// DocumentSpecAssetResourceRef struct for DocumentSpecAssetResourceRef -type DocumentSpecAssetResourceRef struct { - Kind string `json:"kind"` - Name string `json:"name,omitempty"` - // Title for the article. - Title string `json:"title"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go index 965960053..dc76a182e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpecSections (catalog.v1alpha1.Document) +// DocumentSpecSections struct for DocumentSpecSections type DocumentSpecSections struct { // Title for the section. Title string `json:"title"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go index 85b38267f..e3ca9d297 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go @@ -9,7 +9,7 @@ package catalog -// DocumentStatus (catalog.v1alpha1.Document) +// DocumentStatus struct for DocumentStatus type DocumentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go index c24bd20d2..e001632b3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go @@ -9,7 +9,7 @@ package catalog -// MarketplaceSpec (catalog.v1alpha1.Marketplace) +// MarketplaceSpec struct for MarketplaceSpec type MarketplaceSpec struct { // description of the Marketplace. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go index 02abd6bd5..b39e2c608 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpec (catalog.v1alpha1.ProductOverview) +// ProductOverviewSpec struct for ProductOverviewSpec type ProductOverviewSpec struct { // Defines all the documents and order for marketplace. Documents []ProductOverviewSpecDocuments `json:"documents,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go index 1fcd645e1..3b1abe808 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpecDocuments (catalog.v1alpha1.ProductOverview) +// ProductOverviewSpecDocuments struct for ProductOverviewSpecDocuments type ProductOverviewSpecDocuments struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go index 90fbcb6f2..cb8796183 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanReferences (catalog.v1alpha1.ProductPlan) +// ProductPlanReferences struct for ProductPlanReferences type ProductPlanReferences struct { Product ProductPlanReferencesProduct `json:"product,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go index d683d8cdf..aa39f6c0b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanReferencesProduct (catalog.v1alpha1.ProductPlan) +// ProductPlanReferencesProduct struct for ProductPlanReferencesProduct type ProductPlanReferencesProduct struct { // The latest active Product Release that corresponds to the Product referenced in the Plan. Release string `json:"release,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go index 347d03f56..193413ab9 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpec (catalog.v1alpha1.ProductPlan) +// ProductPlanSpec struct for ProductPlanSpec type ProductPlanSpec struct { Product string `json:"product"` // description of the Plan. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go index 014975f11..43ff2945b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go @@ -9,11 +9,10 @@ package catalog -// ProductPlanSpecBilling Paid plan billing details. (catalog.v1alpha1.ProductPlan) +// ProductPlanSpecBilling Paid plan billing details. type ProductPlanSpecBilling struct { Currency string `json:"currency"` // The base price for the plan. - // GENERATE: The following code has been modified after code generation Price float64 `json:"price,omitempty"` // The billing cycle type. Cycle string `json:"cycle,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go index 4b326fc9c..d5149ec33 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecFeatures (catalog.v1alpha1.ProductPlan) +// ProductPlanSpecFeatures struct for ProductPlanSpecFeatures type ProductPlanSpecFeatures struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go index 35cc8d634..76ed7d216 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecSubscription Defines Plan's subscription information (catalog.v1alpha1.ProductPlan) +// ProductPlanSpecSubscription Defines Plan's subscription information type ProductPlanSpecSubscription struct { Interval ProductPlanSpecSubscriptionInterval `json:"interval,omitempty"` Renewal string `json:"renewal,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go index f7fff5517..1ce5a94ee 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecSubscriptionInterval The subscription interval (catalog.v1alpha1.ProductPlan) +// ProductPlanSpecSubscriptionInterval The subscription interval type ProductPlanSpecSubscriptionInterval struct { // The type of the interval Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go index fc278ab0d..d7cf3cb10 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go @@ -9,10 +9,10 @@ package catalog -// ProductPlanStatus (catalog.v1alpha1.ProductPlan) +// ProductPlanStatus struct for ProductPlanStatus type ProductPlanStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []ProductPlanStatusReasons `json:"reasons,omitempty"` + Reasons []SubscriptionStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go deleted file mode 100644 index 5ee793237..000000000 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go +++ /dev/null @@ -1,28 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -import ( - // GENERATE: The following code has been modified after code generation - // - // "time" - time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" -) - -// ProductPlanStatusReasons (catalog.v1alpha1.ProductPlan) -type ProductPlanStatusReasons struct { - Type string `json:"type"` - // Details of the error. - Detail string `json:"detail"` - // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (catalog.v1alpha1.ProductPlan) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go index 378d68359..aa02d1e8c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanUnitSpec (catalog.v1alpha1.ProductPlanUnit) +// ProductPlanUnitSpec struct for ProductPlanUnitSpec type ProductPlanUnitSpec struct { // description of the Plan. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go index 6528d466a..69d5c933e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go @@ -9,7 +9,7 @@ package catalog -// ProductReferences (catalog.v1alpha1.Product) +// ProductReferences struct for ProductReferences type ProductReferences struct { // Computed latest AssetReleases for each Asset reference in the Product. Assets []ProductReferencesAssets `json:"assets,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go index 6f5ecba64..cfc2bb3c8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesAssets (catalog.v1alpha1.Product) +// ProductReferencesAssets struct for ProductReferencesAssets type ProductReferencesAssets struct { // The Asset reference. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go index df38258f8..bf0e1e94a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesRelease (catalog.v1alpha1.Product) +// ProductReferencesRelease struct for ProductReferencesRelease type ProductReferencesRelease struct { // The latest AssetRelease computed based on the provided Asset filters. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go index c09b610d4..abd7fdebe 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpec (catalog.v1alpha1.ProductRelease) +// ProductReleaseSpec struct for ProductReleaseSpec type ProductReleaseSpec struct { // Description of the release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go index c7c5ef573..a51f0ef6a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecAssets (catalog.v1alpha1.ProductRelease) +// ProductReleaseSpecAssets struct for ProductReleaseSpecAssets type ProductReleaseSpecAssets struct { // The Asset name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go index fb160fad0..510c432c0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecRelease (catalog.v1alpha1.ProductRelease) +// ProductReleaseSpecRelease struct for ProductReleaseSpecRelease type ProductReleaseSpecRelease struct { Name string `json:"name,omitempty"` // The AssetRelease version. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go index 3b16eced1..d8232a485 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseStatus (catalog.v1alpha1.ProductRelease) +// ProductReleaseStatus struct for ProductReleaseStatus type ProductReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go index ebe424a75..ae74d3554 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go @@ -22,6 +22,6 @@ type ProductReleaseStatusError struct { // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go index 88abde487..4fdfbd19b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go @@ -22,6 +22,6 @@ type ProductReleaseStatusPending struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // Reason for being in Pending. - Detail string `json:"detail"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go index 7b9c12a6a..cc3fa3cca 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go @@ -22,6 +22,6 @@ type ProductReleaseStatusSuccess struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // message of the result - Detail string `json:"detail"` - Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductStatusMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go index 84f849552..8e1df7ed8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go @@ -9,11 +9,13 @@ package catalog -// ProductSpec (catalog.v1alpha1.Product) +// ProductSpec struct for ProductSpec type ProductSpec struct { // description of the Product. - Description string `json:"description,omitempty"` - Categories []string `json:"categories,omitempty"` + Description string `json:"description,omitempty"` + SupportContact string `json:"supportContact,omitempty"` + Categories []string `json:"categories,omitempty"` // Defines all the Assets that the Product will be built from. - Assets []ProductSpecAssets `json:"assets,omitempty"` + Assets []ProductSpecAssets `json:"assets,omitempty"` + AutoRelease ProductSpecAutoRelease `json:"autoRelease,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go index b793520a3..863bd4440 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAssets (catalog.v1alpha1.Product) +// ProductSpecAssets struct for ProductSpecAssets type ProductSpecAssets struct { Name string `json:"name"` Filters ProductSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go similarity index 54% rename from pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go rename to pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go index a266aa28b..b07c3f31b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go @@ -9,8 +9,7 @@ package catalog -// ProductReleaseStatusPendingMeta struct for ProductReleaseStatusPendingMeta -type ProductReleaseStatusPendingMeta struct { - Asset string `json:"asset,omitempty"` - AssetRelease string `json:"assetRelease,omitempty"` +// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. +type ProductSpecAutoRelease struct { + ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go index 820904d35..91b2c87f4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecFilters Filters what AssetRelease the Product points to. (catalog.v1alpha1.Product) +// ProductSpecFilters Filters what AssetRelease the Product points to. type ProductSpecFilters struct { // The AssetRelease version to use. Examples: - 1.0.1 for a specific asset release version - 1.* for all minor and patch versions of version 1 - 1.2.* for all the patch version for version 1.2 Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go index 0c4ef8f9a..39e077949 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go @@ -9,7 +9,7 @@ package catalog -// ProductStatus (catalog.v1alpha1.Product) +// ProductStatus struct for ProductStatus type ProductStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go index 7b4cc7ea0..c1c997094 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go @@ -9,7 +9,7 @@ package catalog -// ProductStatusMeta (catalog.v1alpha1.Product) +// ProductStatusMeta struct for ProductStatusMeta type ProductStatusMeta struct { Asset string `json:"asset,omitempty"` AssetRelease string `json:"assetRelease,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go index 4e692ef2d..596b9572d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ProductStatusReasons (catalog.v1alpha1.Product) +// ProductStatusReasons struct for ProductStatusReasons type ProductStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go index f4fde840e..c67fd69fb 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductVisibilitySpec (catalog.v1alpha1.ProductVisibility) +// ProductVisibilitySpec struct for ProductVisibilitySpec type ProductVisibilitySpec struct { // Defines where the visibility settings apply. Products []ProductVisibilitySpecProducts `json:"products"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go index e21f8e525..86695be20 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go @@ -9,7 +9,7 @@ package catalog -// ProductVisibilitySpecProducts (catalog.v1alpha1.ProductVisibility) +// ProductVisibilitySpecProducts struct for ProductVisibilitySpecProducts type ProductVisibilitySpecProducts struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go index 035a63b43..622759a2b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductReferences (catalog.v1alpha1.PublishedProduct) +// PublishedProductReferences struct for PublishedProductReferences type PublishedProductReferences struct { Release PublishedProductReferencesRelease `json:"release"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go index 6005fe445..6f68c1324 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductReferencesRelease The Product release that was published to the marketplace (catalog.v1alpha1.PublishedProduct) +// PublishedProductReferencesRelease The Product release that was published to the marketplace type PublishedProductReferencesRelease struct { // Reference to product release Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go index 38a705f1e..30eb9d35a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductSpec (catalog.v1alpha1.PublishedProduct) +// PublishedProductSpec struct for PublishedProductSpec type PublishedProductSpec struct { Product PublishedProductSpecProduct `json:"product,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go index ff5112b19..1e0d904ac 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductSpecProduct (catalog.v1alpha1.PublishedProduct) +// PublishedProductSpecProduct struct for PublishedProductSpecProduct type PublishedProductSpecProduct struct { Name string `json:"name,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go index abf5d78dc..275facb58 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go @@ -9,7 +9,7 @@ package catalog -// QuotaSpec (catalog.v1alpha1.Quota) +// QuotaSpec struct for QuotaSpec type QuotaSpec struct { // description of the quota. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_loose_overages.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_loose_overages.go index d0b041c09..ef05c8c1f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_loose_overages.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_loose_overages.go @@ -12,6 +12,5 @@ package catalog // QuotaSpecLimitTypeLooseOverages struct for QuotaSpecLimitTypeLooseOverages type QuotaSpecLimitTypeLooseOverages struct { // The overage price per unit. - // GENERATE: The following code has been modified after code generation Value float64 `json:"value,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_tiered_tiers.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_tiered_tiers.go index 3c15afe37..1db4a86a5 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_tiered_tiers.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec_limit_type_tiered_tiers.go @@ -16,9 +16,7 @@ type QuotaSpecLimitTypeTieredTiers struct { // The limit end of the tier provided. To int32 `json:"to"` // The tier price. - // GENERATE: The following code has been modified after code generation Cost float64 `json:"cost"` // The flat fee for the tier. - // GENERATE: The following code has been modified after code generation FlatFee float64 `json:"flatFee"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go index dc45db4d1..862b00157 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go @@ -9,7 +9,7 @@ package catalog -// QuotaStatus (catalog.v1alpha1.Quota) +// QuotaStatus struct for QuotaStatus type QuotaStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go index d6817c936..3242eb5f1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go @@ -9,7 +9,7 @@ package catalog -// ReleaseTagSpec (catalog.v1alpha1.ReleaseTag) +// ReleaseTagSpec struct for ReleaseTagSpec type ReleaseTagSpec struct { // Description of the Release Tag. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go index 24161fd2d..afe58703c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go @@ -9,7 +9,7 @@ package catalog -// ReleaseTagStatus (catalog.v1alpha1.ReleaseTag) +// ReleaseTagStatus struct for ReleaseTagStatus type ReleaseTagStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go index f69ef9e60..7c747ce96 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// ResourceSpec (catalog.v1alpha1.Resource) +// ResourceSpec struct for ResourceSpec type ResourceSpec struct { // The type of the resource, example: pdf FileType string `json:"fileType"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go index 0ae34f7c8..515729652 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go @@ -9,8 +9,8 @@ package catalog -// SecretSpec (catalog.v1alpha1.Secret) +// SecretSpec struct for SecretSpec type SecretSpec struct { - // Key value pairs. The value will be stored encrypted. (catalog.v1alpha1.Secret) + // Key value pairs. The value will be stored encrypted. Data map[string]string `json:"data,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go index 643b6aff5..23911ca00 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go @@ -9,7 +9,7 @@ package catalog -// StageSpec (catalog.v1alpha1.Stage) +// StageSpec struct for StageSpec type StageSpec struct { // description of the stage Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go index c23e4c330..df761436f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionApproval (catalog.v1alpha1.Subscription) +// SubscriptionApproval struct for SubscriptionApproval type SubscriptionApproval struct { State string `json:"state"` // Reason for the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go index 9b6bd341d..6bb1701bb 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go @@ -9,9 +9,9 @@ package catalog -// SubscriptionMarketplace Details about the marketplace Application. (catalog.v1alpha1.Subscription) +// SubscriptionMarketplace Details about the marketplace Application. type SubscriptionMarketplace struct { // The name of the Marketplace. - Name string `json:"name"` - Resource SubscriptionMarketplaceResource `json:"resource"` + Name string `json:"name"` + Resource ApplicationMarketplaceResource `json:"resource"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go deleted file mode 100644 index d4b91d117..000000000 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go +++ /dev/null @@ -1,16 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -// SubscriptionMarketplaceResource The Marketplace Application resource details. (catalog.v1alpha1.Subscription) -type SubscriptionMarketplaceResource struct { - Metadata SubscriptionMarketplaceResourceMetadata `json:"metadata"` - Owner SubscriptionMarketplaceResourceOwner `json:"owner,omitempty"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go deleted file mode 100644 index 65ac58dde..000000000 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go +++ /dev/null @@ -1,18 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package catalog - -// SubscriptionMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Subscription) -type SubscriptionMarketplaceResourceMetadata struct { - // Id of the user that created the entity. - CreateUserId string `json:"createUserId,omitempty"` - // Id of the user that created the entity. - ModifyUserId string `json:"modifyUserId,omitempty"` -} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go index bc94568b6..263cae6b9 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionSpec (catalog.v1alpha1.Subscription) +// SubscriptionSpec struct for SubscriptionSpec type SubscriptionSpec struct { // Reference to Product resource Product string `json:"product"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go index 638f17c01..0c05bccb7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionSpecPlan (catalog.v1alpha1.Subscription) +// SubscriptionSpecPlan struct for SubscriptionSpecPlan type SubscriptionSpecPlan struct { // Reference to Product resource Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go index 84c88825d..22f9a1722 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionStatus (catalog.v1alpha1.Subscription) +// SubscriptionStatus struct for SubscriptionStatus type SubscriptionStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go index 95864e69b..fe0bb7532 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go @@ -16,13 +16,12 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// SubscriptionStatusReasons (catalog.v1alpha1.Subscription) +// SubscriptionStatusReasons struct for SubscriptionStatusReasons type SubscriptionStatusReasons struct { Type string `json:"type"` // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (catalog.v1alpha1.Subscription) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go new file mode 100644 index 000000000..8f3b46375 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go @@ -0,0 +1,18 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SupportContactSpec struct for SupportContactSpec +type SupportContactSpec struct { + // Email address of the Support Contact. + Email string `json:"email"` + // String of the E.164 format of the phone number, e.g. +11234567899 + PhoneNumber string `json:"phoneNumber,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go index 8700da1a7..7f79f2591 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go @@ -9,11 +9,11 @@ package catalog -// WebhookSpec (catalog.v1alpha1.Webhook) +// WebhookSpec struct for WebhookSpec type WebhookSpec struct { Auth WebhookSpecAuth `json:"auth,omitempty"` Enabled bool `json:"enabled,omitempty"` Url string `json:"url"` - // A list of headers that will be sent as par of the http call to the webhook endpoint. (catalog.v1alpha1.Webhook) + // A list of headers that will be sent as par of the http call to the webhook endpoint. Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go index c5e1e0022..e4b959210 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go @@ -9,7 +9,7 @@ package catalog -// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. (catalog.v1alpha1.Webhook) +// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. type WebhookSpecAuth struct { Secret WebhookSpecAuthSecret `json:"secret,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go index 14e937d15..f1373f0a4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go @@ -9,7 +9,7 @@ package catalog -// WebhookSpecAuthSecret (catalog.v1alpha1.Webhook) +// WebhookSpecAuthSecret struct for WebhookSpecAuthSecret type WebhookSpecAuthSecret struct { // Secret name to be used as a reference. If the secret is removed, the reference gets removed and the webhook invocation will be done with no Authorization header. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scope.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scope.go index 2f34281a9..b7af58c89 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scope.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scope.go @@ -13,4 +13,10 @@ package definitions type AccessControlListSpecAccessLevelScope struct { // Resource level at which access is being granted. Level string `json:"level,omitempty"` + // Set true to allow users to create scoped resources. + AllowCreateScoped bool `json:"allowCreateScoped,omitempty"` + // Set true to allow users to delete the unscoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the unscoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go index 9b0c4af29..4db20f2bb 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go @@ -15,4 +15,10 @@ type AccessControlListSpecAccessLevelScopedKind struct { Level string `json:"level,omitempty"` // The kind of scoped resources to provide access to or \"*\" for all kinds. Kind string `json:"kind"` + // Set true to allow users to create scoped resources of the specified kind. + AllowCreate bool `json:"allowCreate,omitempty"` + // Set true to allow users to delete scoped resources of the specified kind. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update scoped resources of the specified kind. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go index 4b932b8a6..ee88cae65 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go @@ -17,4 +17,8 @@ type AccessControlListSpecAccessLevelScopedResource struct { Kind string `json:"kind"` // The name of the scoped resource to provide access to. Name string `json:"name"` + // Set true to allow users to delete the referenced scoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the referenced scoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go index 224b74f20..7c14f0df4 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package definitions -// AccessControlListSpecRules (definitions.v1alpha1.AccessControlList) +// AccessControlListSpecRules struct for AccessControlListSpecRules type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go index 92cd34640..077a525d5 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package definitions -// AccessControlListSpecSubjects (definitions.v1alpha1.AccessControlList) +// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go index e209cd422..366ee3cb7 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpec (definitions.v1alpha1.CommandLineInterface) +// CommandLineInterfaceSpec struct for CommandLineInterfaceSpec type CommandLineInterfaceSpec struct { // A reference to a resource definition. ResourceDefinition string `json:"resourceDefinition"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go index a9c196435..081a69eb2 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpecColumns (definitions.v1alpha1.CommandLineInterface) +// CommandLineInterfaceSpecColumns struct for CommandLineInterfaceSpecColumns type CommandLineInterfaceSpecColumns struct { // The name of the column for the resource. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go index 904b1f828..88bc9fce7 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpecNames (definitions.v1alpha1.CommandLineInterface) +// CommandLineInterfaceSpecNames struct for CommandLineInterfaceSpecNames type CommandLineInterfaceSpecNames struct { // Defines the name used to access resources in this group. Also provided as default in the autocomplete for listing commands. Plural string `json:"plural"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go index 0cafe5ef4..53c3d1bd1 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpec (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpec struct for ResourceDefinitionSpec type ResourceDefinitionSpec struct { // Value used in the endpoint path for accessing the resource. Plural string `json:"plural"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go index 851db8538..d712de7c5 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferences (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecReferences struct for ResourceDefinitionSpecReferences type ResourceDefinitionSpecReferences struct { // A list of resources that the current resources has references to. ToResources []ResourceDefinitionSpecReferencesToResources `json:"toResources,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go index e3b6f8f7e..103391945 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFrom (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecReferencesFrom struct for ResourceDefinitionSpecReferencesFrom type ResourceDefinitionSpecReferencesFrom struct { // Defines the subResource which is referring to the resource. Omit for non subResource references. SubResourceName string `json:"subResourceName,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go index f5234680f..461f7927b 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFrom1 (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecReferencesFrom1 struct for ResourceDefinitionSpecReferencesFrom1 type ResourceDefinitionSpecReferencesFrom1 struct { // Defines the subResource referencing this resource. Omit for non subResource references. SubResourceName string `json:"subResourceName,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go index 669aaf867..2d255dcd3 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFromResources (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecReferencesFromResources struct for ResourceDefinitionSpecReferencesFromResources type ResourceDefinitionSpecReferencesFromResources struct { // Defines the kind of the resource. Group string `json:"group,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go index b9479df89..9be6ca6b7 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesToResources (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecReferencesToResources struct for ResourceDefinitionSpecReferencesToResources type ResourceDefinitionSpecReferencesToResources struct { // Defines the kind of the resource. Group string `json:"group,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go index 1b6464038..517b5c337 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecScope (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecScope struct for ResourceDefinitionSpecScope type ResourceDefinitionSpecScope struct { // Defines the kind of the scope. The server infers this from the endpoint the client submits the request to. Kind string `json:"kind,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go index f602599ba..ca761e91d 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecSubResources Describes the subresources that the current resource might have. (definitions.v1alpha1.ResourceDefinition) +// ResourceDefinitionSpecSubResources Describes the subresources that the current resource might have. type ResourceDefinitionSpecSubResources struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go index 6c0aa7812..7fcecff30 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionVersionSpec (definitions.v1alpha1.ResourceDefinitionVersion) +// ResourceDefinitionVersionSpec struct for ResourceDefinitionVersionSpec type ResourceDefinitionVersionSpec struct { // A reference to a resource definition. ResourceDefinition string `json:"resourceDefinition"` @@ -19,6 +19,6 @@ type ResourceDefinitionVersionSpec struct { Served bool `json:"served"` // Defines if this version is used when storing the resource instance details. Storage bool `json:"storage"` - // Defines the strucure of the spec for this resource version. (definitions.v1alpha1.ResourceDefinitionVersion) + // Defines the strucure of the spec for this resource version. Spec map[string]interface{} `json:"spec,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scope.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scope.go index ef12e6e9a..9ff26dbba 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scope.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scope.go @@ -13,4 +13,10 @@ package management type AccessControlListSpecAccessLevelScope struct { // Resource level at which access is being granted. Level string `json:"level,omitempty"` + // Set true to allow users to create scoped resources. + AllowCreateScoped bool `json:"allowCreateScoped,omitempty"` + // Set true to allow users to delete the unscoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the unscoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go index 62e696463..8c991c512 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_kind.go @@ -15,4 +15,10 @@ type AccessControlListSpecAccessLevelScopedKind struct { Level string `json:"level,omitempty"` // The kind of scoped resources to provide access to or \"*\" for all kinds. Kind string `json:"kind"` + // Set true to allow users to create scoped resources of the specified kind. + AllowCreate bool `json:"allowCreate,omitempty"` + // Set true to allow users to delete scoped resources of the specified kind. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update scoped resources of the specified kind. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go index 7710dcfaa..a9ca87e2d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_access_level_scoped_resource.go @@ -17,4 +17,8 @@ type AccessControlListSpecAccessLevelScopedResource struct { Kind string `json:"kind"` // The name of the scoped resource to provide access to. Name string `json:"name"` + // Set true to allow users to delete the referenced scoped resource. + AllowDelete bool `json:"allowDelete,omitempty"` + // Set true to allow users to update the referenced scoped resource. + AllowWrite bool `json:"allowWrite,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go index 60fc36fbb..4d652ecd4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package management -// AccessControlListSpecRules (management.v1alpha1.AccessControlList) +// AccessControlListSpecRules struct for AccessControlListSpecRules type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go index 3f7682d0a..127fab72a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package management -// AccessControlListSpecSubjects (management.v1alpha1.AccessControlList) +// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go index cd5afe9b8..c54bf5a74 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go @@ -9,8 +9,8 @@ package management -// AccessRequestDefinitionSpecProvision (management.v1alpha1.AccessRequestDefinition) +// AccessRequestDefinitionSpecProvision struct for AccessRequestDefinitionSpecProvision type AccessRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. (management.v1alpha1.AccessRequestDefinition) + // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. Schema map[string]interface{} `json:"schema"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go index 0d5e6f2d1..6bb73f018 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go @@ -9,7 +9,7 @@ package management -// AccessRequestSpecQuota Quota information for accessing the api. (management.v1alpha1.AccessRequest) +// AccessRequestSpecQuota Quota information for accessing the api. type AccessRequestSpecQuota struct { // The limit of the allowed quota for the access request. // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go index 9b1ec126a..58ba1d8de 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go @@ -9,7 +9,7 @@ package management -// AccessRequestStatus (management.v1alpha1.AccessRequest) +// AccessRequestStatus struct for AccessRequestStatus type AccessRequestStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go index 3d9d4d3bc..069864504 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go @@ -16,13 +16,12 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AccessRequestStatusReasons (management.v1alpha1.AccessRequest) +// AccessRequestStatusReasons struct for AccessRequestStatusReasons type AccessRequestStatusReasons struct { Type string `json:"type"` // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (management.v1alpha1.AccessRequest) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go index a268b211e..d15dceb02 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyConfigSpec (management.v1alpha1.AmplifyConfig) +// AmplifyConfigSpec struct for AmplifyConfigSpec type AmplifyConfigSpec struct { Address AmplifyConfigSpecAddress `json:"address"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go index 7ff05dbf7..8be7451e4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go @@ -9,7 +9,7 @@ package management -// AmplifyConfigSpecAddress The listener address configuration. (management.v1alpha1.AmplifyConfig) +// AmplifyConfigSpecAddress The listener address configuration. type AmplifyConfigSpecAddress struct { // The listener interface Interface string `json:"interface"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go index e877834fb..277de89f0 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyJwtAuthRuleSpec (management.v1alpha1.AmplifyJWTAuthRule) +// AmplifyJwtAuthRuleSpec struct for AmplifyJwtAuthRuleSpec type AmplifyJwtAuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` @@ -20,7 +20,7 @@ type AmplifyJwtAuthRuleSpec struct { Audiences []string `json:"audiences,omitempty"` // The name of the field in the JWT payload representing the client Id. Default: cid ClientIdKey string `json:"clientIdKey,omitempty"` - // The list of loactions from which to read the JWT tokens. + // The list of locations from which to read the JWT tokens. From []AmplifyJwtAuthRuleSpecFrom `json:"from,omitempty"` // The maximum clock skew allowed when verify time constraints (default 60secs). ClockSkewSeconds int32 `json:"clockSkewSeconds,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go index e83190fc3..cb253790b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go @@ -9,10 +9,11 @@ package management -// AmplifyJwtAuthRuleSpecFrom (management.v1alpha1.AmplifyJWTAuthRule) +// AmplifyJwtAuthRuleSpecFrom struct for AmplifyJwtAuthRuleSpecFrom type AmplifyJwtAuthRuleSpecFrom struct { // Where to look for the token. - In string `json:"in,omitempty"` + In string `json:"in"` + // Name of the JWT key field, defaults to Authorization. Name string `json:"name"` // The token prefix, e.g. \"Bearer \". Prefix string `json:"prefix,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go index e55ddda2a..17a6f5eb6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go @@ -9,7 +9,7 @@ package management -// AmplifyJwtAuthRuleSpecJwks (management.v1alpha1.AmplifyJWTAuthRule) +// AmplifyJwtAuthRuleSpecJwks struct for AmplifyJwtAuthRuleSpecJwks type AmplifyJwtAuthRuleSpecJwks struct { // The URI from which to fetch the JSON Web Key Set(JWKS). Uri string `json:"uri"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go index 36cde679a..64c33c69d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyOAuth2AuthRuleSpec (management.v1alpha1.AmplifyOAuth2AuthRule) +// AmplifyOAuth2AuthRuleSpec struct for AmplifyOAuth2AuthRuleSpec type AmplifyOAuth2AuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go index 79ab97829..90b56ddbd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go @@ -9,9 +9,9 @@ package management -// AmplifyRuntimeConfigSpec (management.v1alpha1.AmplifyRuntimeConfig) +// AmplifyRuntimeConfigSpec struct for AmplifyRuntimeConfigSpec type AmplifyRuntimeConfigSpec struct { - // The runtime config. (management.v1alpha1.AmplifyRuntimeConfig) + // The runtime config. RuntimeConfig map[string]interface{} `json:"runtimeConfig"` AmplifyConfig string `json:"amplifyConfig"` ExternalSecrets []map[string]interface{} `json:"externalSecrets,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go index d05629f1a..550da1862 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go @@ -9,7 +9,7 @@ package management -// AmplifyRuntimeConfigStatus (management.v1alpha1.AmplifyRuntimeConfig) +// AmplifyRuntimeConfigStatus struct for AmplifyRuntimeConfigStatus type AmplifyRuntimeConfigStatus struct { Name string `json:"name"` // Description of the phase. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go index dd7ee7a0d..93db465e2 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go @@ -9,12 +9,12 @@ package management -// ApiKeyAuthRuleSpec (management.v1alpha1.APIKeyAuthRule) +// ApiKeyAuthRuleSpec struct for ApiKeyAuthRuleSpec type ApiKeyAuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` // Where to look for the API key, defaults to header. In string `json:"in,omitempty"` - // name of the API key field, defaults to x-api-key. + // The name of the API key, defaults to x-api-key. Name string `json:"name,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go index c2fbac11e..0342e0e11 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go @@ -9,7 +9,7 @@ package management -// ApiServiceDetails (management.v1alpha1.APIService) +// ApiServiceDetails struct for ApiServiceDetails type ApiServiceDetails struct { // Specification type for the API Service. SpecType string `json:"specType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go index 64b4d5468..2290f27f6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceInstanceSpec (management.v1alpha1.APIServiceInstance) +// ApiServiceInstanceSpec struct for ApiServiceInstanceSpec type ApiServiceInstanceSpec struct { ApiServiceRevision string `json:"apiServiceRevision"` AccessRequestDefinition string `json:"accessRequestDefinition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go index 9e4625054..6e3c14e6b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go @@ -9,7 +9,7 @@ package management -// ApiServiceInstanceSpecEndpoint (management.v1alpha1.APIServiceInstance) +// ApiServiceInstanceSpecEndpoint struct for ApiServiceInstanceSpecEndpoint type ApiServiceInstanceSpecEndpoint struct { Host string `json:"host"` Port int32 `json:"port,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go index 30a315800..70878d8d5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go @@ -9,8 +9,10 @@ package management -// ApiServiceInstanceSpecRouting (management.v1alpha1.APIServiceInstance) +// ApiServiceInstanceSpecRouting struct for ApiServiceInstanceSpecRouting type ApiServiceInstanceSpecRouting struct { // The base path to the API. Example: '/api'. BasePath string `json:"basePath,omitempty"` + // Specify any additional routing details needed + Details map[string]map[string]interface{} `json:"details,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go index 519391a96..343801ab3 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceRevisionSpec (management.v1alpha1.APIServiceRevision) +// ApiServiceRevisionSpec struct for ApiServiceRevisionSpec type ApiServiceRevisionSpec struct { ApiService string `json:"apiService"` Definition ApiServiceRevisionSpecDefinition `json:"definition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go index d6ec995de..685a74ce4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go @@ -9,7 +9,7 @@ package management -// ApiServiceRevisionSpecDefinition The api specification details. (management.v1alpha1.APIServiceRevision) +// ApiServiceRevisionSpecDefinition The api specification details. type ApiServiceRevisionSpecDefinition struct { // The type of the api specification. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go index 889c3e636..f4bc24f3f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceSpec (management.v1alpha1.APIService) +// ApiServiceSpec struct for ApiServiceSpec type ApiServiceSpec struct { // The description of the api service. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go index 0d5087db4..4b820370d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go @@ -9,7 +9,7 @@ package management -// ApiServiceSpecIcon Image for the APIService. (management.v1alpha1.APIService) +// ApiServiceSpecIcon Image for the APIService. type ApiServiceSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go index d2376f082..7e853bfa6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go @@ -9,7 +9,7 @@ package management -// ApiServiceStatus (management.v1alpha1.APIService) +// ApiServiceStatus struct for ApiServiceStatus type ApiServiceStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go index f8d6f22f4..a39a8b5a5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpec (management.v1alpha1.APISpec) +// ApiSpecSpec struct for ApiSpecSpec type ApiSpecSpec struct { SpecDiscoveryRef string `json:"specDiscoveryRef,omitempty"` Definition ApiSpecSpecDefinition `json:"definition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go index cfe8b7094..9e83de0b9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpecDefinition (management.v1alpha1.APISpec) +// ApiSpecSpecDefinition struct for ApiSpecSpecDefinition type ApiSpecSpecDefinition struct { // The type of the api specification. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go index 5722de40e..639b3c0cd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpecEndpoints (management.v1alpha1.APISpec) +// ApiSpecSpecEndpoints struct for ApiSpecSpecEndpoints type ApiSpecSpecEndpoints struct { // The type of the endpoint. Type string `json:"type,omitempty"` @@ -19,6 +19,6 @@ type ApiSpecSpecEndpoints struct { Port string `json:"port,omitempty"` // The path on which this spec was discovered. Path string `json:"path,omitempty"` - // The labels for the pod this spec was discovered on. (management.v1alpha1.APISpec) + // The labels for the pod this spec was discovered on. Labels map[string]string `json:"labels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go index 4e4e30311..86daf83b2 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go @@ -9,7 +9,7 @@ package management -// AssetMappingSpec (management.v1alpha1.AssetMapping) +// AssetMappingSpec struct for AssetMappingSpec type AssetMappingSpec struct { // Reference to the executed AssetMappingTemplate. AssetMappingTemplate string `json:"assetMappingTemplate,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go index c8830b963..4d64e7f7a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go @@ -9,7 +9,7 @@ package management -// AssetMappingSpecInputs The list of the inputs provided to the template. (management.v1alpha1.AssetMapping) +// AssetMappingSpecInputs The list of the inputs provided to the template. type AssetMappingSpecInputs struct { ApiService string `json:"apiService"` ApiServiceRevision string `json:"apiServiceRevision,omitempty"` @@ -18,4 +18,6 @@ type AssetMappingSpecInputs struct { Stage string `json:"stage,omitempty"` // list of categories for the asset. Categories []string `json:"categories,omitempty"` + // title for generated asset resource. + AssetResourceTitle string `json:"assetResourceTitle,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go index f547f5383..c1b4c0ed0 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatus (management.v1alpha1.AssetMapping) +// AssetMappingStatus struct for AssetMappingStatus type AssetMappingStatus struct { Level string `json:"level,omitempty"` Source AssetMappingStatusSource `json:"source,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go index 02c630a18..d851d320a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusOutputs (management.v1alpha1.AssetMapping) +// AssetMappingStatusOutputs struct for AssetMappingStatusOutputs type AssetMappingStatusOutputs struct { Resource AssetMappingStatusResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go index 1fd3809e0..f4616f207 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. (management.v1alpha1.AssetMapping) +// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. type AssetMappingStatusResource struct { AssetResource AssetMappingStatusResourceAssetResource `json:"assetResource,omitempty"` Stage AssetMappingStatusResourceStage `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go index 8fb411957..0225ee397 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResourceAssetResource (management.v1alpha1.AssetMapping) +// AssetMappingStatusResourceAssetResource struct for AssetMappingStatusResourceAssetResource type AssetMappingStatusResourceAssetResource struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go index 028c933b9..3fca3bac4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResourceStage (management.v1alpha1.AssetMapping) +// AssetMappingStatusResourceStage struct for AssetMappingStatusResourceStage type AssetMappingStatusResourceStage struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go index b302e45cf..d7240edbd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSource (management.v1alpha1.AssetMapping) +// AssetMappingStatusSource struct for AssetMappingStatusSource type AssetMappingStatusSource struct { Resource AssetMappingStatusSourceResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go index 3502d5316..a62b3889b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. (management.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. type AssetMappingStatusSourceResource struct { ApiService AssetMappingStatusSourceResourceApiService `json:"apiService,omitempty"` ApiServiceRevision AssetMappingStatusSourceResourceApiServiceRevision `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go index f8d5ce97f..11bf478e7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiService (management.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiService struct for AssetMappingStatusSourceResourceApiService type AssetMappingStatusSourceResourceApiService struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go index 3ed5207f5..70e958af0 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiServiceInstance (management.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiServiceInstance struct for AssetMappingStatusSourceResourceApiServiceInstance type AssetMappingStatusSourceResourceApiServiceInstance struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go index 51ba28567..a45a85073 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiServiceRevision (management.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceApiServiceRevision struct for AssetMappingStatusSourceResourceApiServiceRevision type AssetMappingStatusSourceResourceApiServiceRevision struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go index ebfc24ceb..9ec01d2f6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceAssetMappingTemplate (management.v1alpha1.AssetMapping) +// AssetMappingStatusSourceResourceAssetMappingTemplate struct for AssetMappingStatusSourceResourceAssetMappingTemplate type AssetMappingStatusSourceResourceAssetMappingTemplate struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go index 6026b2e46..19f23eabb 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpec (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpec struct for AssetMappingTemplateSpec type AssetMappingTemplateSpec struct { // A list of filters for the API Service resource on which the template applies. Filters []AssetMappingTemplateSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go index 14fb9cdca..47b6a5eda 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go @@ -9,11 +9,11 @@ package management -// AssetMappingTemplateSpecApiService (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpecApiService struct for AssetMappingTemplateSpecApiService type AssetMappingTemplateSpecApiService struct { // The name of the API Service. Name string `json:"name,omitempty"` - // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) + // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. Attributes map[string]string `json:"attributes,omitempty"` ApiServiceRevision AssetMappingTemplateSpecApiServiceRevision `json:"apiServiceRevision,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go index a9e6c2529..345ca864d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go @@ -9,9 +9,9 @@ package management -// AssetMappingTemplateSpecApiServiceRevision (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpecApiServiceRevision struct for AssetMappingTemplateSpecApiServiceRevision type AssetMappingTemplateSpecApiServiceRevision struct { - // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) + // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. Attributes map[string]string `json:"attributes,omitempty"` ApiServiceInstance AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance `json:"apiServiceInstance,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go index 33f055089..ac805ed94 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go @@ -9,8 +9,8 @@ package management -// AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance struct for AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance type AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance struct { - // Attributes used to filter the APIServiceInstances for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) + // Attributes used to filter the APIServiceInstances for the API Service on which the template applies. Attributes map[string]string `json:"attributes,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go index 8ceadc0d7..2060752ae 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpecAsset (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpecAsset struct for AssetMappingTemplateSpecAsset type AssetMappingTemplateSpecAsset struct { // name of the asset or a template for name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go index dae36cb6b..37b5cacd3 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpecFilters (management.v1alpha1.AssetMappingTemplate) +// AssetMappingTemplateSpecFilters struct for AssetMappingTemplateSpecFilters type AssetMappingTemplateSpecFilters struct { ApiService []AssetMappingTemplateSpecApiService `json:"apiService,omitempty"` // name of the stage diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go index f684ca657..4b3b42035 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceReferences (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceReferences struct for ConsumerInstanceReferences type ConsumerInstanceReferences struct { // Reference to Amplify Central APIService ApiService string `json:"apiService,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go index be3016d91..81a0c235d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpec (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceSpec struct for ConsumerInstanceSpec type ConsumerInstanceSpec struct { // Maps to the name of the Catalog Item. If not provided, the resource title will be used. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go index 29cb4ccca..9a9d1b076 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecAdditionalDataProperties The Catalog Item properties for additional data. (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceSpecAdditionalDataProperties The Catalog Item properties for additional data. type ConsumerInstanceSpecAdditionalDataProperties struct { // Defines the unstructured data type. Example 'APIBuilderConnector' or 'SDK'. Type string `json:"type"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go index 80df37ed9..60df13b4a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecIcon Image for the Catalog Item. If not present, the icon on the APISevice will be used in the Catalog Item. (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceSpecIcon Image for the Catalog Item. If not present, the icon on the APISevice will be used in the Catalog Item. type ConsumerInstanceSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go index 9f4335df9..bc7283a24 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecSubscription (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceSpecSubscription struct for ConsumerInstanceSpecSubscription type ConsumerInstanceSpecSubscription struct { // Defines if subscriptions are allowed on the Catalog Item. Enabled bool `json:"enabled,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go index 8785b8e91..133936c10 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecUnstructuredDataProperties The Catalog Item properties for unstructured definition subtypes. (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceSpecUnstructuredDataProperties The Catalog Item properties for unstructured definition subtypes. type ConsumerInstanceSpecUnstructuredDataProperties struct { // Defines the unstructured data type. Example 'APIBuilderConnector' or 'SDK'. Type string `json:"type"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go index c48eff33c..e61ff5529 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceStatus (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceStatus struct for ConsumerInstanceStatus type ConsumerInstanceStatus struct { Phase ConsumerInstanceStatusPhase `json:"phase"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go index abcad7dd5..0d258d6c1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ConsumerInstanceStatusPhase (management.v1alpha1.ConsumerInstance) +// ConsumerInstanceStatusPhase struct for ConsumerInstanceStatusPhase type ConsumerInstanceStatusPhase struct { Name string `json:"name"` // The criticality of the last update diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go index 327fafc22..deec9ce29 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go @@ -9,7 +9,7 @@ package management -// ConsumerSubscriptionDefinitionSpec (management.v1alpha1.ConsumerSubscriptionDefinition) +// ConsumerSubscriptionDefinitionSpec struct for ConsumerSubscriptionDefinitionSpec type ConsumerSubscriptionDefinitionSpec struct { // List of Webhook kind resource names that dictates what webhooks will be invoked on subscription changes. Webhooks []string `json:"webhooks,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go index 58c5bcc21..5d3046b6b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go @@ -9,7 +9,7 @@ package management -// ConsumerSubscriptionDefinitionSpecSchema Subscription definition properties to be used by the consumers. (management.v1alpha1.ConsumerSubscriptionDefinition) +// ConsumerSubscriptionDefinitionSpecSchema Subscription definition properties to be used by the consumers. type ConsumerSubscriptionDefinitionSpecSchema struct { // Defines the subscription schema properties as key/value pairs. Properties []ConsumerSubscriptionDefinitionSpecSchemaProperties `json:"properties,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go index 2d0609005..5302684ed 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go @@ -9,10 +9,10 @@ package management -// ConsumerSubscriptionDefinitionSpecSchemaProperties (management.v1alpha1.ConsumerSubscriptionDefinition) +// ConsumerSubscriptionDefinitionSpecSchemaProperties struct for ConsumerSubscriptionDefinitionSpecSchemaProperties type ConsumerSubscriptionDefinitionSpecSchemaProperties struct { // The Catalog Item subscription spec key. For API type subscriptions, the key needs to be 'profile'. Key string `json:"key"` - // JSON schema to specify data needed from consumers when subscriptions are created. (management.v1alpha1.ConsumerSubscriptionDefinition) + // JSON schema to specify data needed from consumers when subscriptions are created. Value map[string]interface{} `json:"value"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go index 763dbada1..09f20f259 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go @@ -9,7 +9,7 @@ package management -// CorsRuleSpec (management.v1alpha1.CorsRule) +// CorsRuleSpec struct for CorsRuleSpec type CorsRuleSpec struct { // CORS configuration rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go index 65a6dcba5..2509dbde8 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialPoliciesExpiry (management.v1alpha1.Credential) +// CredentialPoliciesExpiry struct for CredentialPoliciesExpiry type CredentialPoliciesExpiry struct { // Time when the Credential is set to be expired. Timestamp time.Time `json:"timestamp"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go index ea1fb185d..1d5dfc373 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go @@ -9,7 +9,7 @@ package management -// CredentialReferences (management.v1alpha1.Credential) +// CredentialReferences struct for CredentialReferences type CredentialReferences struct { // Name of the catalog Application for which the initial Credential was generated Application string `json:"application,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go index 17da9c6bd..2cd0aef4b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionReferences (management.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionReferences struct for CredentialRequestDefinitionReferences type CredentialRequestDefinitionReferences struct { // The name of the CredentialRequestDefinition from an Environment. CredentialReqDef string `json:"credentialReqDef,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go index 9a89ae8e7..1081acf8b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. (management.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. type CredentialRequestDefinitionSpecProvisionPoliciesExpiry struct { // The number of days after the Credentials are considered to be expired. Period int32 `json:"period"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go index 4821e9d20..8b70666b8 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions (management.v1alpha1.CredentialRequestDefinition) +// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct for CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions type CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct { // The type of the action taken when the Credential using this definition expires. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go index af5137bfa..59b5f0947 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go @@ -9,13 +9,13 @@ package management -// CredentialSpec (management.v1alpha1.Credential) +// CredentialSpec struct for CredentialSpec type CredentialSpec struct { // Reference to Credential Request Definition resource CredentialRequestDefinition string `json:"credentialRequestDefinition"` // Reference to the ManagedApplication for which the Credential belongs to ManagedApplication string `json:"managedApplication"` - // data matching the credential request definition schema. (management.v1alpha1.Credential) + // data matching the credential request definition schema. Data map[string]interface{} `json:"data"` State CredentialSpecState `json:"state,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go index c96e3c2af..979b485dc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go @@ -9,11 +9,11 @@ package management -// CredentialSpecState Desired state of the Credential. (management.v1alpha1.Credential) +// CredentialSpecState Desired state of the Credential. type CredentialSpecState struct { Name string `json:"name"` // Additional info on the desired state. Reason string `json:"reason,omitempty"` - // Defines on if credential needs to be rotated. + // Defines if credential needs to be rotated. Rotate bool `json:"rotate,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go index 4ed4a8e2d..4acd9cf6c 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go @@ -9,7 +9,7 @@ package management -// CredentialState Current state of the Credential. (management.v1alpha1.Credential) +// CredentialState Current state of the Credential. type CredentialState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go index df4029e9f..0dddf8348 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go @@ -9,10 +9,10 @@ package management -// CredentialStatus (management.v1alpha1.Credential) +// CredentialStatus struct for CredentialStatus type CredentialStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []CredentialStatusReasons `json:"reasons,omitempty"` + Reasons []AccessRequestStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go deleted file mode 100644 index b43a275f5..000000000 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go +++ /dev/null @@ -1,28 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package management - -import ( - // GENERATE: The following code has been modified after code generation - // - // "time" - time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" -) - -// CredentialStatusReasons (management.v1alpha1.Credential) -type CredentialStatusReasons struct { - Type string `json:"type"` - // Details of the error. - Detail string `json:"detail"` - // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - // (management.v1alpha1.Credential) - Meta map[string]map[string]interface{} `json:"meta,omitempty"` -} diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go index 987747f3c..c9479af20 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go @@ -9,7 +9,7 @@ package management -// DeploymentReferences (management.v1alpha1.Deployment) +// DeploymentReferences struct for DeploymentReferences type DeploymentReferences struct { // Reference to the API Service that got created from this deployment. ApiService string `json:"apiService,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go index 209bd5e13..646e0591b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go @@ -9,7 +9,7 @@ package management -// DeploymentSpec (management.v1alpha1.Deployment) +// DeploymentSpec struct for DeploymentSpec type DeploymentSpec struct { // The name of an APIServiceInstance resource that specifies where the API is deployed. VirtualAPIRelease string `json:"virtualAPIRelease"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go index f9f8b1638..a457d9bc6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go @@ -9,7 +9,7 @@ package management -// DeploymentStatus (management.v1alpha1.Deployment) +// DeploymentStatus struct for DeploymentStatus type DeploymentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go index b6b13b403..82539866d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpec (management.v1alpha1.DiscoveryAgent) +// DiscoveryAgentSpec struct for DiscoveryAgentSpec type DiscoveryAgentSpec struct { // The dataplane type that this agent connects to DataplaneType string `json:"dataplaneType"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go index 9764a40f5..59fd25581 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpecConfig Represents the discovery agent config (management.v1alpha1.DiscoveryAgent) +// DiscoveryAgentSpecConfig Represents the discovery agent config type DiscoveryAgentSpecConfig struct { // Defines the tag based filter expression to be evaluated for discovering the API from the API Gateway. The filter value is a conditional expression that can use logical operators to compare two value. The conditional expression must have \"tag\" as the prefix/selector in the symbol name. For e.g. ``` tag.SOME_TAG == \"somevalue\" ``` The expression can be a simple condition as shown above or compound condition in which more than one simple conditions are evaluated using logical operator. For e.g. ``` tag.SOME_TAG == \"somevalue\" || tag.ANOTHER_TAG != \"some_other_value\" ``` In addition to logical expression, the filter can hold call based expressions. Below are the list of supported call expressions #### Exists Exists call can be made to evaluate if the tag name exists in the list of tags on API. This call expression can be used as unary expression For e.g. ``` tag.SOME_TAG.Exists() ``` #### Any Any call can be made in a simple expression to evaluate if the tag with any name has specified value or not in the list of tags on the API. For e.g. ``` tag.Any() == \"Tag with some value\" || tag.Any() != \"Tag with other value\" ``` #### Contains Contains call can be made in a simple expression to evaluate if the the specified tag contains specified argument as value. This call expression requires string argument that will be used to perform lookup in tag value For e.g. ``` tag.Contains(\"somevalue\") ``` #### MatchRegEx MatchRegEx call can be used for evaluating the specified tag value to match specified regular expression. This call expression requires a regular expression as the argument. For e.g. ``` tag.MatchRegEx(\"(some){1}\") ``` Filter string `json:"filter,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go index ee0b86f91..cdfe4f0dc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpecLogging Logging config (management.v1alpha1.DiscoveryAgent) +// DiscoveryAgentSpecLogging Logging config type DiscoveryAgentSpecLogging struct { // Defines the log level. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go index 4f60d5628..19a3773bc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// DiscoveryAgentStatus (management.v1alpha1.DiscoveryAgent) +// DiscoveryAgentStatus struct for DiscoveryAgentStatus type DiscoveryAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go index 9355ba4c4..df7d79d58 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go @@ -9,11 +9,10 @@ package management -// EnvironmentSpec (management.v1alpha1.Environment) +// EnvironmentSpec struct for EnvironmentSpec type EnvironmentSpec struct { - Description string `json:"description,omitempty"` - // (management.v1alpha1.Environment) - Variables map[string]string `json:"variables,omitempty"` + Description string `json:"description,omitempty"` + Variables map[string]string `json:"variables,omitempty"` // Production environment will be used to perform production processing or connect to a non-Axway gateway. This usage will count against your entitled quota. Production bool `json:"production,omitempty"` // Axway Managed environment is hosted in the Axway Managed Cloud. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go index 13e078211..03d96189b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go @@ -9,7 +9,7 @@ package management -// EnvironmentSpecIcon Image for the Environment. (management.v1alpha1.Environment) +// EnvironmentSpecIcon Image for the Environment. type EnvironmentSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go index 71ced93bc..c56c3964f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go @@ -9,7 +9,7 @@ package management -// ExternalSecretSpec (management.v1alpha1.ExternalSecret) +// ExternalSecretSpec struct for ExternalSecretSpec type ExternalSecretSpec struct { // GENERATE: The following code has been modified after code generation Config interface{} `json:"config"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go index 046244344..795e76708 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go @@ -9,7 +9,7 @@ package management -// GovernanceAgentAgentconfigstatus (management.v1alpha1.GovernanceAgent) +// GovernanceAgentAgentconfigstatus struct for GovernanceAgentAgentconfigstatus type GovernanceAgentAgentconfigstatus struct { // Version of the config. ResourceVersion string `json:"resourceVersion,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go index 69e6ca733..2d34342a6 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go @@ -9,10 +9,10 @@ package management -// GovernanceAgentSpec (management.v1alpha1.GovernanceAgent) +// GovernanceAgentSpec struct for GovernanceAgentSpec type GovernanceAgentSpec struct { // The dataplane type that this agent connects to DataplaneType string `json:"dataplaneType"` - // Represents the governance agent config (management.v1alpha1.GovernanceAgent) + // Represents the governance agent config Config map[string]interface{} `json:"config,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go index e5b69d7ee..93fb7e923 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// GovernanceAgentStatus (management.v1alpha1.GovernanceAgent) +// GovernanceAgentStatus struct for GovernanceAgentStatus type GovernanceAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go index 488f88480..78216a174 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go @@ -9,7 +9,7 @@ package management -// IntegrationSpec (management.v1alpha1.Integration) +// IntegrationSpec struct for IntegrationSpec type IntegrationSpec struct { Description string `json:"description,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go index 9ab1159ee..be80cbf2b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go @@ -9,7 +9,7 @@ package management -// K8SClusterSpec (management.v1alpha1.K8SCluster) +// K8SClusterSpec struct for K8SClusterSpec type K8SClusterSpec struct { Mesh string `json:"mesh,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go index 2a92bf18d..8b1900bba 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go @@ -9,14 +9,12 @@ package management -// K8SResourceSpec (management.v1alpha1.K8SResource) +// K8SResourceSpec struct for K8SResourceSpec type K8SResourceSpec struct { ResourceDiscovery string `json:"resourceDiscovery,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` Uid string `json:"uid,omitempty"` OwnerReferences []K8SResourceSpecOwnerReferences `json:"ownerReferences,omitempty"` - // (management.v1alpha1.K8SResource) - ResourceSpec map[string]interface{} `json:"resourceSpec,omitempty"` - // (management.v1alpha1.K8SResource) - ResourceStatus map[string]interface{} `json:"resourceStatus,omitempty"` + ResourceSpec map[string]interface{} `json:"resourceSpec,omitempty"` + ResourceStatus map[string]interface{} `json:"resourceStatus,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go index 7fd4b0ed3..1d02d7b8a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go @@ -9,7 +9,7 @@ package management -// K8SResourceSpecOwnerReferences (management.v1alpha1.K8SResource) +// K8SResourceSpecOwnerReferences struct for K8SResourceSpecOwnerReferences type K8SResourceSpecOwnerReferences struct { Kind string `json:"kind,omitempty"` Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go index fde9dad92..2bf7c4244 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplace Details about the marketplace Application. (management.v1alpha1.ManagedApplication) +// ManagedApplicationMarketplace Details about the marketplace Application. type ManagedApplicationMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go index e08699ce7..7931d2848 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResource The Marketplace Application resource details. (management.v1alpha1.ManagedApplication) +// ManagedApplicationMarketplaceResource The Marketplace Application resource details. type ManagedApplicationMarketplaceResource struct { Metadata ManagedApplicationMarketplaceResourceMetadata `json:"metadata"` Owner ManagedApplicationMarketplaceResourceOwner `json:"owner,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go index e9ec73e2e..642e9d5bb 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceMetadata Marketplace Application metadata. (management.v1alpha1.ManagedApplication) +// ManagedApplicationMarketplaceResourceMetadata Marketplace Application metadata. type ManagedApplicationMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go index 012a39bab..1619d3e3e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceOwner Owner of the Application. (management.v1alpha1.ManagedApplication) +// ManagedApplicationMarketplaceResourceOwner Owner of the Application. type ManagedApplicationMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go index 885e863c1..5548b92ee 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceOwnerOrganization Organization details. (management.v1alpha1.ManagedApplication) +// ManagedApplicationMarketplaceResourceOwnerOrganization Organization details. type ManagedApplicationMarketplaceResourceOwnerOrganization struct { // Id of the organization. Id string `json:"id"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go index bb97e6939..142f1973a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationReferences (management.v1alpha1.ManagedApplication) +// ManagedApplicationReferences struct for ManagedApplicationReferences type ManagedApplicationReferences struct { // Reference to Application resource Application string `json:"application,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go index 68fd4b93d..eae90dba8 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationSpec (management.v1alpha1.ManagedApplication) +// ManagedApplicationSpec struct for ManagedApplicationSpec type ManagedApplicationSpec struct { Security ManagedApplicationSpecSecurity `json:"security,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go index 2d5349b29..f02a8b800 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationSpecSecurity (management.v1alpha1.ManagedApplication) +// ManagedApplicationSpecSecurity struct for ManagedApplicationSpecSecurity type ManagedApplicationSpecSecurity struct { // public key to be used to encrypt the credentials linked to this Managed Application. EncryptionKey string `json:"encryptionKey"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go index e807aed3c..5fe764f3a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationStatus (management.v1alpha1.ManagedApplication) +// ManagedApplicationStatus struct for ManagedApplicationStatus type ManagedApplicationStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go index 04afe7cfc..605757172 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go @@ -9,7 +9,7 @@ package management -// MeshDiscoverySpec (management.v1alpha1.MeshDiscovery) +// MeshDiscoverySpec struct for MeshDiscoverySpec type MeshDiscoverySpec struct { // Target environment. EnvironmentRef string `json:"environmentRef"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go index 2a8f3b6f1..5d619b822 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go @@ -9,9 +9,9 @@ package management -// MeshServiceSpec (management.v1alpha1.MeshService) +// MeshServiceSpec struct for MeshServiceSpec type MeshServiceSpec struct { - // The labels used by the service to match workloads it exposes. (management.v1alpha1.MeshService) + // The labels used by the service to match workloads it exposes. Selector map[string]string `json:"selector,omitempty"` // Reference to the K8SResource derived from the Kubernetes Service. Resource string `json:"resource,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go index 6e02e1f4d..8f8890cb7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go @@ -9,10 +9,10 @@ package management -// MeshServiceSpecEndpoints (management.v1alpha1.MeshService) +// MeshServiceSpecEndpoints struct for MeshServiceSpecEndpoints type MeshServiceSpecEndpoints struct { Workloads []string `json:"workloads,omitempty"` - // A subset is the set of labels one or more workloads has outside the labels in the service selector. (management.v1alpha1.MeshService) + // A subset is the set of labels one or more workloads has outside the labels in the service selector. Subset map[string]string `json:"subset,omitempty"` // Array of references to apispecs discovered by the discovery agent. Specs []string `json:"specs,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go index e00c53768..b6dafa46e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go @@ -9,7 +9,7 @@ package management -// MeshServiceSpecPorts (management.v1alpha1.MeshService) +// MeshServiceSpecPorts struct for MeshServiceSpecPorts type MeshServiceSpecPorts struct { Name string `json:"name,omitempty"` Port int32 `json:"port,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go index 5c5c33075..8ca996e0f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go @@ -9,11 +9,11 @@ package management -// MeshWorkloadSpec (management.v1alpha1.MeshWorkload) +// MeshWorkloadSpec struct for MeshWorkloadSpec type MeshWorkloadSpec struct { // References to k8sresources making up the workload. Resources []string `json:"resources,omitempty"` - // Labels from the k8sresources making up the workload. (management.v1alpha1.MeshWorkload) + // Labels from the k8sresources making up the workload. Labels map[string]string `json:"labels,omitempty"` // Discovered ports on the workload. Ports []MeshWorkloadSpecPorts `json:"ports,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go index f48b9a3da..4b77bb4b2 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go @@ -9,7 +9,7 @@ package management -// MeshWorkloadSpecPorts (management.v1alpha1.MeshWorkload) +// MeshWorkloadSpecPorts struct for MeshWorkloadSpecPorts type MeshWorkloadSpecPorts struct { // The name of the port. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go index 81de60597..5f92ec7c9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go @@ -9,7 +9,7 @@ package management -// MeshWorkloadSpecSpecs API specs exposed by this workload on this port. (management.v1alpha1.MeshWorkload) +// MeshWorkloadSpecSpecs API specs exposed by this workload on this port. type MeshWorkloadSpecSpecs struct { // Array of references to apispecs discovered by the discovery agent. DiscoveredSpecs []string `json:"discoveredSpecs,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go index 78c66008d..77c659d15 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go @@ -9,9 +9,8 @@ package management -// Oas3DocumentSpec (management.v1alpha1.OAS3Document) +// Oas3DocumentSpec struct for Oas3DocumentSpec type Oas3DocumentSpec struct { - VirtualService string `json:"virtualService"` - // (management.v1alpha1.OAS3Document) - Oas map[string]interface{} `json:"oas"` + VirtualService string `json:"virtualService"` + Oas map[string]interface{} `json:"oas"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go index 0a345bbcd..15d0ac20f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go @@ -9,7 +9,7 @@ package management -// ReleaseTagSpec (management.v1alpha1.ReleaseTag) +// ReleaseTagSpec struct for ReleaseTagSpec type ReleaseTagSpec struct { // Description of the Release Tag. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go index 299708684..b568e466a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go @@ -9,7 +9,7 @@ package management -// ReleaseTagStatus (management.v1alpha1.ReleaseTag) +// ReleaseTagStatus struct for ReleaseTagStatus type ReleaseTagStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go index 096b7d949..e63b006f0 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go @@ -9,7 +9,7 @@ package management -// ResourceDiscoverySpec (management.v1alpha1.ResourceDiscovery) +// ResourceDiscoverySpec struct for ResourceDiscoverySpec type ResourceDiscoverySpec struct { Version string `json:"version,omitempty"` Kind string `json:"kind,omitempty"` @@ -20,6 +20,5 @@ type ResourceDiscoverySpec struct { KeepStatusFields []string `json:"keepStatusFields,omitempty"` IgnoreLabels []string `json:"ignoreLabels,omitempty"` Tags []string `json:"tags,omitempty"` - // (management.v1alpha1.ResourceDiscovery) - ExtraAttributes map[string]string `json:"extraAttributes,omitempty"` + ExtraAttributes map[string]string `json:"extraAttributes,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go index 664a23d9a..275199217 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go @@ -9,7 +9,7 @@ package management -// ResourceDiscoverySpecNamespaceFilter Namespace filter. (management.v1alpha1.ResourceDiscovery) +// ResourceDiscoverySpecNamespaceFilter Namespace filter. type ResourceDiscoverySpecNamespaceFilter struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go index 8a07d2f61..003c65cee 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go @@ -9,9 +9,8 @@ package management -// ResourceDiscoverySpecResourceFilter Resource filter. (management.v1alpha1.ResourceDiscovery) +// ResourceDiscoverySpecResourceFilter Resource filter. type ResourceDiscoverySpecResourceFilter struct { - Names []string `json:"names,omitempty"` - // (management.v1alpha1.ResourceDiscovery) + Names []string `json:"names,omitempty"` MatchLabels map[string]string `json:"matchLabels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go index d43b8fcb7..2eb738584 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpec (management.v1alpha1.ResourceHook) +// ResourceHookSpec struct for ResourceHookSpec type ResourceHookSpec struct { Triggers []ResourceHookSpecTriggers `json:"triggers"` // List of Webhook kind resource names that dictates what webhooks will be invoked on matching triggers. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go index 640103499..d1cdc9cc1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpecScope Resource scope trigger details. (management.v1alpha1.ResourceHook) +// ResourceHookSpecScope Resource scope trigger details. type ResourceHookSpecScope struct { // Value for the Kind of the scope of the resource. Use \"*\" for any. Kind string `json:"kind"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go index 6f1f97dde..7447cd0a5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpecTriggers (management.v1alpha1.ResourceHook) +// ResourceHookSpecTriggers struct for ResourceHookSpecTriggers type ResourceHookSpecTriggers struct { // Value for the group of the resource. Use \"*\" for any. Group string `json:"group"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go index f6b80841f..3827bb080 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go @@ -9,8 +9,8 @@ package management -// SecretSpec (management.v1alpha1.Secret) +// SecretSpec struct for SecretSpec type SecretSpec struct { - // Key value pairs. The value will be stored encrypted. (management.v1alpha1.Secret) + // Key value pairs. The value will be stored encrypted. Data map[string]string `json:"data,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go index d5c3c1fd1..38dc30fbd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpec (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpec struct for SpecDiscoverySpec type SpecDiscoverySpec struct { NamespaceFilter SpecDiscoverySpecNamespaceFilter `json:"namespaceFilter,omitempty"` ResourceFilter SpecDiscoverySpecResourceFilter `json:"resourceFilter,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go index 71e7c8dcc..86ac8eb5e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecNamespaceFilter a list of namespace names to follow. If not set, follows all namespaces. (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpecNamespaceFilter a list of namespace names to follow. If not set, follows all namespaces. type SpecDiscoverySpecNamespaceFilter struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go index f31b161ae..8bf037437 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go @@ -9,9 +9,8 @@ package management -// SpecDiscoverySpecResourceFilter Filter pod resources by name or labels. (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpecResourceFilter Filter pod resources by name or labels. type SpecDiscoverySpecResourceFilter struct { - Names []string `json:"names,omitempty"` - // (management.v1alpha1.SpecDiscovery) + Names []string `json:"names,omitempty"` MatchLabels map[string]string `json:"matchLabels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go index ab3aa284a..d0cbc63f2 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecTargets (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpecTargets struct for SpecDiscoverySpecTargets type SpecDiscoverySpecTargets struct { ExactPaths []SpecDiscoverySpecTargetsExactPaths `json:"exactPaths,omitempty"` FromAnnotation []SpecDiscoverySpecTargetsFromAnnotation `json:"fromAnnotation,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go index a3ee9a2f8..ef904ab2b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go @@ -9,10 +9,10 @@ package management -// SpecDiscoverySpecTargetsExactPaths (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpecTargetsExactPaths struct for SpecDiscoverySpecTargetsExactPaths type SpecDiscoverySpecTargetsExactPaths struct { // path to api definition Path string `json:"path,omitempty"` - // headers to add to the query (management.v1alpha1.SpecDiscovery) + // headers to add to the query Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go index 0a05dcfdc..e4ef17771 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecTargetsFromAnnotation (management.v1alpha1.SpecDiscovery) +// SpecDiscoverySpecTargetsFromAnnotation struct for SpecDiscoverySpecTargetsFromAnnotation type SpecDiscoverySpecTargetsFromAnnotation struct { // annotation template. golang template that's fed the following object for each declared port of the pod: {\"name\", \"number\"} Template string `json:"template,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go index f98bee250..1934bd381 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go @@ -9,10 +9,10 @@ package management -// TraceabilityAgentSpec (management.v1alpha1.TraceabilityAgent) +// TraceabilityAgentSpec struct for TraceabilityAgentSpec type TraceabilityAgentSpec struct { // The dataplane type that this agent connects to - DataplaneType string `json:"dataplaneType"` - Config TraceabilityAgentSpecConfig `json:"config"` - Logging TraceabilityAgentSpecLogging `json:"logging,omitempty"` + DataplaneType string `json:"dataplaneType"` + Config TraceabilityAgentSpecConfig `json:"config"` + Logging DiscoveryAgentSpecLogging `json:"logging,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go index 44ae5406e..e6ca926e4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go @@ -9,7 +9,7 @@ package management -// TraceabilityAgentSpecConfig Represents the traceability agent config (management.v1alpha1.TraceabilityAgent) +// TraceabilityAgentSpecConfig Represents the traceability agent config type TraceabilityAgentSpecConfig struct { // Name of the team that owns the catalog item created by agent. If not provided, the default team will be used. OwningTeam string `json:"owningTeam,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go deleted file mode 100644 index 4517f511b..000000000 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go +++ /dev/null @@ -1,16 +0,0 @@ -/* - * API Server specification. - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * API version: SNAPSHOT - * Generated by: OpenAPI Generator (https://openapi-generator.tech) - */ - -package management - -// TraceabilityAgentSpecLogging Logging config (management.v1alpha1.TraceabilityAgent) -type TraceabilityAgentSpecLogging struct { - // Defines the log level. - Level string `json:"level,omitempty"` -} diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go index 2d853d7b4..0ba463e21 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// TraceabilityAgentStatus (management.v1alpha1.TraceabilityAgent) +// TraceabilityAgentStatus struct for TraceabilityAgentStatus type TraceabilityAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go index e9f2cf129..c6d7b5785 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go @@ -9,7 +9,7 @@ package management -// VirtualApiReleaseSpec (management.v1alpha1.VirtualAPIRelease) +// VirtualApiReleaseSpec struct for VirtualApiReleaseSpec type VirtualApiReleaseSpec struct { // description of the asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go index 203abba5c..4562da104 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go @@ -9,7 +9,7 @@ package management -// VirtualApiSpec (management.v1alpha1.VirtualAPI) +// VirtualApiSpec struct for VirtualApiSpec type VirtualApiSpec struct { // description of the asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go index 732e03900..3ffd1b9d1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go @@ -9,7 +9,7 @@ package management -// VirtualApiStatus (management.v1alpha1.VirtualAPI) +// VirtualApiStatus struct for VirtualApiStatus type VirtualApiStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go index 1bc17241b..0ceee7676 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go @@ -9,7 +9,7 @@ package management -// VirtualHostSpec (management.v1alpha1.VirtualHost) +// VirtualHostSpec struct for VirtualHostSpec type VirtualHostSpec struct { // The fully qualifield domain name as described in RFC 1035 Domain string `json:"domain"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go index d599b9496..dd4a18652 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go @@ -9,18 +9,13 @@ package management -// VirtualServiceSpec (management.v1alpha1.VirtualService) +// VirtualServiceSpec struct for VirtualServiceSpec type VirtualServiceSpec struct { // The path prefix to match. Example /api/v1 Prefix string `json:"prefix"` - // The list of headers and values to match. These are ANDed together. (management.v1alpha1.VirtualService) - HeaderMatch map[string]string `json:"headerMatch,omitempty"` - // The hosts that the VirtualService will match. - VirtualHosts []string `json:"virtualHosts,omitempty"` - Cors string `json:"cors,omitempty"` + Cors string `json:"cors,omitempty"` // GENERATE: The following code has been modified after code generation - Auth interface{} `json:"auth"` - Lambdas []string `json:"lambdas,omitempty"` + Auth interface{} `json:"auth"` // GENERATE: The following code has been modified after code generation - Route []VirtualServiceSpecServiceRouting `json:"route"` + Route []interface{} `json:"route"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyjwtauthrule.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyjwtauthrule.go index 1dd62545a..654a42a6f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyjwtauthrule.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyjwtauthrule.go @@ -13,4 +13,6 @@ package management type VirtualServiceSpecAmplifyjwtauthrule struct { Kind string `json:"kind"` Name string `json:"name"` + // Parameter not required meaning auth credentials are not forwarded to the backend by default. If set to true, auth credentials are forwarded. + ForwardAuthCredentials bool `json:"forwardAuthCredentials,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyoauth2authrule.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyoauth2authrule.go index a4cc77765..5680f46de 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyoauth2authrule.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_amplifyoauth2authrule.go @@ -13,4 +13,6 @@ package management type VirtualServiceSpecAmplifyoauth2authrule struct { Kind string `json:"kind"` Name string `json:"name"` + // Parameter not required meaning auth credentials are not forwarded to the backend by default. If set to true, auth credentials are forwarded. + ForwardAuthCredentials bool `json:"forwardAuthCredentials,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_apikeyauthrule.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_apikeyauthrule.go index 72d090c96..a55177db3 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_apikeyauthrule.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_apikeyauthrule.go @@ -13,4 +13,6 @@ package management type VirtualServiceSpecApikeyauthrule struct { Kind string `json:"kind"` Name string `json:"name"` + // Parameter not required meaning auth credentials are not forwarded to the backend by default. If set to true, auth credentials are forwarded. + ForwardAuthCredentials bool `json:"forwardAuthCredentials,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_operation_rules.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_operation_rules.go index 7ca2bb1c2..f300234df 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_operation_rules.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec_operation_rules.go @@ -13,6 +13,5 @@ package management type VirtualServiceSpecOperationRules struct { Cors string `json:"cors,omitempty"` // GENERATE: The following code has been modified after code generation - Auth interface{} `json:"auth,omitempty"` - Lambdas []string `json:"lambdas,omitempty"` + Auth interface{} `json:"auth,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go index 55d4552ab..5a351b994 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpec (management.v1alpha1.WatchTopic) +// WatchTopicSpec struct for WatchTopicSpec type WatchTopicSpec struct { // Description of the WatchTopic Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go index b6042ad8e..2ae6470a1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpecFilters (management.v1alpha1.WatchTopic) +// WatchTopicSpecFilters struct for WatchTopicSpecFilters type WatchTopicSpecFilters struct { // Value for the group of the resource. Use \"*\" for any. Group string `json:"group"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go index 5e13849ed..df695ad93 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpecScope Resource scope filter details. (management.v1alpha1.WatchTopic) +// WatchTopicSpecScope Resource scope filter details. type WatchTopicSpecScope struct { // Value for the Kind of the scope of the resource. Use \"*\" for any. Kind string `json:"kind"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go index a4b10f49a..67837fdf9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go @@ -9,11 +9,11 @@ package management -// WebhookSpec (management.v1alpha1.Webhook) +// WebhookSpec struct for WebhookSpec type WebhookSpec struct { Auth WebhookSpecAuth `json:"auth,omitempty"` Enabled bool `json:"enabled,omitempty"` Url string `json:"url"` - // A list of headers that will be sent as par of the http call to the webhook endpoint. (management.v1alpha1.Webhook) + // A list of headers that will be sent as par of the http call to the webhook endpoint. Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go index 3db48e727..c75935a5a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go @@ -9,7 +9,7 @@ package management -// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. (management.v1alpha1.Webhook) +// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. type WebhookSpecAuth struct { Secret WebhookSpecAuthSecret `json:"secret,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go index b53cc9665..0518329ad 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go @@ -9,7 +9,7 @@ package management -// WebhookSpecAuthSecret (management.v1alpha1.Webhook) +// WebhookSpecAuthSecret struct for WebhookSpecAuthSecret type WebhookSpecAuthSecret struct { // Secret name to be used as a reference. If the secret is removed, the reference gets removed and the webhook invocation will be done with no Authorization header. Name string `json:"name,omitempty"` From 162c09adac437aebd20b51caf5435344a9c9c263 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Wed, 2 Nov 2022 15:36:47 -0700 Subject: [PATCH 2/8] APIGOV-24037 - update specparser test --- go.sum | 11 +- pkg/apic/specparser_test.go | 258 +++++++++++++++++------------------- 2 files changed, 124 insertions(+), 145 deletions(-) diff --git a/go.sum b/go.sum index 40e84d258..ddb0589a6 100644 --- a/go.sum +++ b/go.sum @@ -489,8 +489,6 @@ golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220923203811-8be639271d50 h1:vKyz8L3zkd+xrMeIaBsQ/MNVPVFSffdaU3ZyYlBGFnI= -golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -567,8 +565,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -578,8 +575,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -636,8 +632,7 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/apic/specparser_test.go b/pkg/apic/specparser_test.go index 27f097d5a..f06908307 100644 --- a/pkg/apic/specparser_test.go +++ b/pkg/apic/specparser_test.go @@ -17,84 +17,119 @@ func createSpecParser(specFile, specType string) (SpecResourceParser, error) { } func TestSpecDiscovery(t *testing.T) { - // JSON OAS3 specification - specParser, err := createSpecParser("./testdata/petstore-openapi3.json", "") - assert.Nil(t, err) - specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Oas3, specProcessor.getResourceType()) - _, ok := specProcessor.(*oas3SpecProcessor) - assert.True(t, ok) - - // YAML OAS2 specification - specParser, err = createSpecParser("./testdata/petstore-openapi2.yaml", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Oas2, specProcessor.getResourceType()) - _, ok = specProcessor.(*oas2SpecProcessor) - assert.True(t, ok) - - // JSON OAS2 specification - specParser, err = createSpecParser("./testdata/petstore-swagger2.json", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Oas2, specProcessor.getResourceType()) - _, ok = specProcessor.(*oas2SpecProcessor) - assert.True(t, ok) - - // WSDL specification - specParser, err = createSpecParser("./testdata/weather.xml", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Wsdl, specProcessor.getResourceType()) - _, ok = specProcessor.(*wsdlProcessor) - assert.True(t, ok) - - // Protobuf specification - specParser, err = createSpecParser("./testdata/petstore.proto", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Protobuf, specProcessor.getResourceType()) - _, ok = specProcessor.(*protobufProcessor) - assert.True(t, ok) - - // AsyncAPI specification - specParser, err = createSpecParser("./testdata/asyncapi-sample.yaml", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, AsyncAPI, specProcessor.getResourceType()) - _, ok = specProcessor.(*asyncAPIProcessor) - assert.True(t, ok) + tests := []struct { + name string + inputFile string + inputType string + parseErr bool + expectedType string + }{ + { + name: "Protobuf input type with OAS3 Spec", + inputFile: "./testdata/petstore-openapi3.json", + parseErr: true, + inputType: Protobuf, + }, + { + name: "Protobuf input type with OAS2 Spec", + inputFile: "./testdata/petstore-openapi2.yaml", + parseErr: true, + inputType: Protobuf, + }, + { + name: "OAS3 input type with WSDL Spec", + inputFile: "./testdata/weather.xml", + parseErr: true, + inputType: Oas3, + }, + { + name: "AsyncAPI input type with Protobuf Spec", + inputFile: "./testdata/petstore.proto", + parseErr: true, + inputType: AsyncAPI, + }, + { + name: "Protobuf input type with AsyncAPI Spec", + inputFile: "./testdata/asyncapi-sample.yaml", + parseErr: true, + inputType: Protobuf, + }, + { + name: "No input type OAS3 Spec", + inputFile: "./testdata/petstore-openapi3.json", + expectedType: Oas3, + }, + { + name: "No input type OAS2 Spec", + inputFile: "./testdata/petstore-openapi2.yaml", + expectedType: Oas2, + }, + { + name: "No input type OAS2 swagger Spec", + inputFile: "./testdata/petstore-swagger2.json", + expectedType: Oas2, + }, + { + name: "No input type WSDL Spec", + inputFile: "./testdata/weather.xml", + expectedType: Wsdl, + }, + { + name: "No input type Protobuf Spec", + inputFile: "./testdata/petstore.proto", + expectedType: Protobuf, + }, + { + name: "No input type AsyncAPI Spec", + inputFile: "./testdata/asyncapi-sample.yaml", + expectedType: AsyncAPI, + }, + { + name: "No input type Unstructured", + inputFile: "./testdata/multiplication.thrift", + expectedType: Unstructured, + }, + } - // Unstructured specification - specParser, err = createSpecParser("./testdata/multiplication.thrift", "") - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Unstructured, specProcessor.getResourceType()) - _, ok = specProcessor.(*unstructuredProcessor) - assert.True(t, ok) + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + specParser, err := createSpecParser(tc.inputFile, tc.inputType) + if tc.parseErr { + assert.NotNil(t, err) + return + } + assert.Nil(t, err) + specProcessor := specParser.GetSpecProcessor() + assert.NotNil(t, specProcessor) + assert.Equal(t, tc.expectedType, specProcessor.getResourceType()) + ok := false + switch tc.expectedType { + case Oas3: + _, ok = specProcessor.(*oas3SpecProcessor) + ValidateOAS3Processors(t, specParser) + case Oas2: + _, ok = specProcessor.(*oas2SpecProcessor) + ValidateOAS2Processors(t, specParser, tc.inputFile) + case Wsdl: + _, ok = specProcessor.(*wsdlProcessor) + ValidateWsdlProcessors(t, specParser) + case Protobuf: + _, ok = specProcessor.(*protobufProcessor) + ValidateProtobufProcessors(t, specParser) + case AsyncAPI: + _, ok = specProcessor.(*asyncAPIProcessor) + ValidateAsyncAPIProcessors(t, specParser) + case Unstructured: + _, ok = specProcessor.(*unstructuredProcessor) + } + assert.True(t, ok) + }) + } } -func TestSpecOAS3Processors(t *testing.T) { +func ValidateOAS3Processors(t *testing.T, specParser SpecResourceParser) { // JSON OAS3 specification - specParser, err := createSpecParser("./testdata/petstore-openapi3.json", Protobuf) - assert.NotNil(t, err) - - // JSON OAS3 specification - specParser, err = createSpecParser("./testdata/petstore-openapi3.json", Oas3) - assert.Nil(t, err) specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Oas3, specProcessor.getResourceType()) - _, ok := specProcessor.(*oas3SpecProcessor) - assert.True(t, ok) - endPoints, err := specProcessor.GetEndpoints() assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with oas3") @@ -182,55 +217,26 @@ func TestSpecOAS3Processors(t *testing.T) { } } -func TestSpecOAS2Processors(t *testing.T) { - specParser, err := createSpecParser("./testdata/petstore-swagger2.json", Protobuf) - assert.NotNil(t, err) - - // JSON OAS3 specification - specParser, err = createSpecParser("./testdata/petstore-swagger2.json", Oas2) - assert.Nil(t, err) +func ValidateOAS2Processors(t *testing.T, specParser SpecResourceParser, inputFile string) { specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Oas2, specProcessor.getResourceType()) - _, ok := specProcessor.(*oas2SpecProcessor) - assert.True(t, ok) - endPoints, err := specProcessor.GetEndpoints() assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with oas2") assert.Len(t, endPoints, 1, "The returned end points array did not have exactly 1 endpoint") assert.Equal(t, "petstore.swagger.io", endPoints[0].Host, "The returned end point had an unexpected value for it's host") - assert.Equal(t, int32(443), endPoints[0].Port, "The returned end point had an unexpected value for it's port") - assert.Equal(t, "https", endPoints[0].Protocol, "The returned end point had an unexpected value for it's protocol") - assert.Equal(t, "/v2", endPoints[0].BasePath, "The base path was not parsed from the JSON as expected") - - specParser, err = createSpecParser("./testdata/petstore-openapi2.yaml", Oas2) - assert.Nil(t, err) - specProcessor = specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - endPoints, err = specProcessor.GetEndpoints() - - assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with oas2") - assert.Len(t, endPoints, 1, "The returned end points array did not have exactly 1 endpoint") - assert.Equal(t, "petstore.swagger.io", endPoints[0].Host, "The returned end point had an unexpected value for it's host") - assert.Equal(t, int32(80), endPoints[0].Port, "The returned end point had an unexpected value for it's port") - assert.Equal(t, "http", endPoints[0].Protocol, "The returned end point had an unexpected value for it's protocol") - assert.Equal(t, "/v1", endPoints[0].BasePath, "The base path was not parsed from the JSON as expected") + if inputFile == "./testdata/petstore-swagger2.json" { + assert.Equal(t, int32(443), endPoints[0].Port, "The returned end point had an unexpected value for it's port") + assert.Equal(t, "https", endPoints[0].Protocol, "The returned end point had an unexpected value for it's protocol") + assert.Equal(t, "/v2", endPoints[0].BasePath, "The base path was not parsed from the JSON as expected") + } else { + assert.Equal(t, int32(80), endPoints[0].Port, "The returned end point had an unexpected value for it's port") + assert.Equal(t, "http", endPoints[0].Protocol, "The returned end point had an unexpected value for it's protocol") + assert.Equal(t, "/v1", endPoints[0].BasePath, "The base path was not parsed from the JSON as expected") + } } -func TestSpecWsdlProcessors(t *testing.T) { - specParser, err := createSpecParser("./testdata/weather.xml", Oas3) - assert.NotNil(t, err) - - // JSON OAS3 specification - specParser, err = createSpecParser("./testdata/weather.xml", Wsdl) - assert.Nil(t, err) +func ValidateWsdlProcessors(t *testing.T, specParser SpecResourceParser) { specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Wsdl, specProcessor.getResourceType()) - _, ok := specProcessor.(*wsdlProcessor) - assert.True(t, ok) - endPoints, err := specProcessor.GetEndpoints() assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with wsdl") @@ -240,38 +246,16 @@ func TestSpecWsdlProcessors(t *testing.T) { assert.Equal(t, "https", endPoints[0].Protocol, "The returned end point had an unexpected value for it's protocol") } -func TestSpecProtobufProcessors(t *testing.T) { - specParser, err := createSpecParser("./testdata/petstore.proto", AsyncAPI) - assert.NotNil(t, err) - - // JSON OAS3 specification - specParser, err = createSpecParser("./testdata/petstore.proto", Protobuf) - assert.Nil(t, err) +func ValidateProtobufProcessors(t *testing.T, specParser SpecResourceParser) { specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, Protobuf, specProcessor.getResourceType()) - _, ok := specProcessor.(*protobufProcessor) - assert.True(t, ok) - endPoints, err := specProcessor.GetEndpoints() assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with protobuf") assert.Len(t, endPoints, 0, "The returned end points array is not empty") } -func TestSpecAsyncAPIProcessors(t *testing.T) { - specParser, err := createSpecParser("./testdata/asyncapi-sample.yaml", Protobuf) - assert.NotNil(t, err) - - // JSON OAS3 specification - specParser, err = createSpecParser("./testdata/asyncapi-sample.yaml", AsyncAPI) - assert.Nil(t, err) +func ValidateAsyncAPIProcessors(t *testing.T, specParser SpecResourceParser) { specProcessor := specParser.GetSpecProcessor() - assert.NotNil(t, specProcessor) - assert.Equal(t, AsyncAPI, specProcessor.getResourceType()) - _, ok := specProcessor.(*asyncAPIProcessor) - assert.True(t, ok) - endPoints, err := specProcessor.GetEndpoints() assert.Nil(t, err, "An unexpected Error was returned from getEndpoints with asyncapi") From 33f3af459e08bb3bd1436faef2421f90458eb7e7 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Thu, 3 Nov 2022 07:02:50 -0700 Subject: [PATCH 3/8] APIGOV-24037 - parse bindings from async spec for endpoint def --- pkg/apic/apiserviceinstance.go | 1 + pkg/apic/definitions.go | 3 ++- pkg/apic/specasyncapiprocessor.go | 5 +++++ pkg/apic/specparser_test.go | 8 ++++++++ pkg/apic/specwsdlprocessor.go | 3 ++- pkg/apic/testdata/asyncapi-sample.yaml | 4 ++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pkg/apic/apiserviceinstance.go b/pkg/apic/apiserviceinstance.go index 6627b82cd..6aea5ea6b 100644 --- a/pkg/apic/apiserviceinstance.go +++ b/pkg/apic/apiserviceinstance.go @@ -179,6 +179,7 @@ func createInstanceEndpoint(endpoints []EndpointDefinition) ([]management.ApiSer Protocol: endpointDef.Protocol, Routing: management.ApiServiceInstanceSpecRouting{ BasePath: endpointDef.BasePath, + Details: endpointDef.Details, }, } endPoints = append(endPoints, ep) diff --git a/pkg/apic/definitions.go b/pkg/apic/definitions.go index 37d3b1342..bb61f75a9 100644 --- a/pkg/apic/definitions.go +++ b/pkg/apic/definitions.go @@ -76,6 +76,7 @@ type EndpointDefinition struct { Port int32 Protocol string BasePath string + Details map[string]map[string]interface{} } // APIError - api response error @@ -90,7 +91,7 @@ type ResponseError struct { Errors []APIError `json:"errors,omitempty"` } -//UnstructuredProperties - +// UnstructuredProperties - type UnstructuredProperties struct { AssetType string ContentType string diff --git a/pkg/apic/specasyncapiprocessor.go b/pkg/apic/specasyncapiprocessor.go index c1c6bb77c..1d866f3ef 100644 --- a/pkg/apic/specasyncapiprocessor.go +++ b/pkg/apic/specasyncapiprocessor.go @@ -55,6 +55,7 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte protocol := "" serverURL := "" var serverVariables map[string]string + serverBindings := map[string]map[string]interface{}{} for key, valueInterface := range serverObjInterface { value, ok := valueInterface.(string) if ok { @@ -71,6 +72,9 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte serverVariables, _ = p.parseVariables(variablesInterface) } } + if key == "bindings" { + serverBindings["bindings"] = valueInterface.(map[string]interface{}) + } } endpoint := EndpointDefinition{} endpoint.Protocol = protocol @@ -84,6 +88,7 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte port, _ := strconv.Atoi(parseURL.Port()) endpoint.Port = int32(port) endpoint.BasePath = parseURL.Path + endpoint.Details = serverBindings return endpoint, err } diff --git a/pkg/apic/specparser_test.go b/pkg/apic/specparser_test.go index f06908307..57fc11688 100644 --- a/pkg/apic/specparser_test.go +++ b/pkg/apic/specparser_test.go @@ -263,4 +263,12 @@ func ValidateAsyncAPIProcessors(t *testing.T, specParser SpecResourceParser) { assert.Equal(t, int32(5676), endPoints[0].Port) assert.Equal(t, "mqtt", endPoints[0].Protocol) assert.Equal(t, "", endPoints[0].BasePath) + assert.Equal(t, map[string]map[string]interface{}{ + "bindings": { + "solace": map[string]interface{}{ + "msgVpn": "apim-test", + "version": "0.2.0", + }, + }, + }, endPoints[0].Details) } diff --git a/pkg/apic/specwsdlprocessor.go b/pkg/apic/specwsdlprocessor.go index dfba62cac..4f13e75cb 100644 --- a/pkg/apic/specwsdlprocessor.go +++ b/pkg/apic/specwsdlprocessor.go @@ -3,6 +3,7 @@ package apic import ( "net" "net/url" + "reflect" "strconv" "github.com/Axway/agent-sdk/pkg/util/log" @@ -61,7 +62,7 @@ func (p *wsdlProcessor) GetEndpoints() ([]EndpointDefinition, error) { func (p *wsdlProcessor) contains(endpts []EndpointDefinition, endpt EndpointDefinition) bool { for _, pt := range endpts { - if pt == endpt { + if reflect.DeepEqual(pt, endpt) { return true } } diff --git a/pkg/apic/testdata/asyncapi-sample.yaml b/pkg/apic/testdata/asyncapi-sample.yaml index 924fab7d6..74b3b7cd8 100644 --- a/pkg/apic/testdata/asyncapi-sample.yaml +++ b/pkg/apic/testdata/asyncapi-sample.yaml @@ -16,6 +16,10 @@ servers: - '5676' - '5677' default: '5676' + bindings: + solace: + msgVpn: apim-test + version: 0.2.0 channels: accounts.1.0.action.user.signup: From 3dcad698e974312c5a1c5ced5d81f0ba324aca2a Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Thu, 3 Nov 2022 07:22:58 -0700 Subject: [PATCH 4/8] APIGOV-24037 - only compare the primatives in wsdl processor --- pkg/apic/specwsdlprocessor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apic/specwsdlprocessor.go b/pkg/apic/specwsdlprocessor.go index 4f13e75cb..bdd5a4d23 100644 --- a/pkg/apic/specwsdlprocessor.go +++ b/pkg/apic/specwsdlprocessor.go @@ -3,7 +3,6 @@ package apic import ( "net" "net/url" - "reflect" "strconv" "github.com/Axway/agent-sdk/pkg/util/log" @@ -62,7 +61,8 @@ func (p *wsdlProcessor) GetEndpoints() ([]EndpointDefinition, error) { func (p *wsdlProcessor) contains(endpts []EndpointDefinition, endpt EndpointDefinition) bool { for _, pt := range endpts { - if reflect.DeepEqual(pt, endpt) { + if pt.Host == endpt.Host && pt.Port == endpt.Port && + pt.Protocol == endpt.Protocol && pt.BasePath == endpt.BasePath { return true } } From 2c33982d1c09154b6ea7adcb152209cab990dcd7 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Thu, 3 Nov 2022 11:03:55 -0700 Subject: [PATCH 5/8] APIGOV-24037 - change details to map[string]interface --- ...model_api_service_instance_spec_routing.go | 3 ++- pkg/apic/definitions.go | 2 +- pkg/apic/specasyncapiprocessor.go | 6 +++--- pkg/apic/specparser_test.go | 10 ++++------ scripts/apiserver/modify_models.sh | 19 +++++++++++++++++++ 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go index 70878d8d5..c671ed1eb 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go @@ -14,5 +14,6 @@ type ApiServiceInstanceSpecRouting struct { // The base path to the API. Example: '/api'. BasePath string `json:"basePath,omitempty"` // Specify any additional routing details needed - Details map[string]map[string]interface{} `json:"details,omitempty"` + // GENERATE: The following code has been modified after code generation + Details map[string]interface{} `json:"details,omitempty"` } diff --git a/pkg/apic/definitions.go b/pkg/apic/definitions.go index bb61f75a9..9b30e20df 100644 --- a/pkg/apic/definitions.go +++ b/pkg/apic/definitions.go @@ -76,7 +76,7 @@ type EndpointDefinition struct { Port int32 Protocol string BasePath string - Details map[string]map[string]interface{} + Details map[string]interface{} } // APIError - api response error diff --git a/pkg/apic/specasyncapiprocessor.go b/pkg/apic/specasyncapiprocessor.go index 1d866f3ef..d57435645 100644 --- a/pkg/apic/specasyncapiprocessor.go +++ b/pkg/apic/specasyncapiprocessor.go @@ -55,7 +55,7 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte protocol := "" serverURL := "" var serverVariables map[string]string - serverBindings := map[string]map[string]interface{}{} + serverDetails := map[string]interface{}{} for key, valueInterface := range serverObjInterface { value, ok := valueInterface.(string) if ok { @@ -73,7 +73,7 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte } } if key == "bindings" { - serverBindings["bindings"] = valueInterface.(map[string]interface{}) + serverDetails = valueInterface.(map[string]interface{}) } } endpoint := EndpointDefinition{} @@ -88,7 +88,7 @@ func (p *asyncAPIProcessor) parseServerObject(serverObjInterface map[string]inte port, _ := strconv.Atoi(parseURL.Port()) endpoint.Port = int32(port) endpoint.BasePath = parseURL.Path - endpoint.Details = serverBindings + endpoint.Details = serverDetails return endpoint, err } diff --git a/pkg/apic/specparser_test.go b/pkg/apic/specparser_test.go index 57fc11688..cebe061ce 100644 --- a/pkg/apic/specparser_test.go +++ b/pkg/apic/specparser_test.go @@ -263,12 +263,10 @@ func ValidateAsyncAPIProcessors(t *testing.T, specParser SpecResourceParser) { assert.Equal(t, int32(5676), endPoints[0].Port) assert.Equal(t, "mqtt", endPoints[0].Protocol) assert.Equal(t, "", endPoints[0].BasePath) - assert.Equal(t, map[string]map[string]interface{}{ - "bindings": { - "solace": map[string]interface{}{ - "msgVpn": "apim-test", - "version": "0.2.0", - }, + assert.Equal(t, map[string]interface{}{ + "solace": map[string]interface{}{ + "msgVpn": "apim-test", + "version": "0.2.0", }, }, endPoints[0].Details) } diff --git a/scripts/apiserver/modify_models.sh b/scripts/apiserver/modify_models.sh index fe0511141..dd4573358 100755 --- a/scripts/apiserver/modify_models.sh +++ b/scripts/apiserver/modify_models.sh @@ -235,6 +235,25 @@ MODELS=`find ${OUTDIR}/models -type f -name "model_*.go"` SEARCH="float32.*\s" REPLACE="float64 " +for file in ${MODELS}; do + if grep -e ${SEARCH} ${file} >> /dev/null; then + # add a comment to the code + $SED -i -e "/${SEARCH}/i ${COMMENT}" ${file} + # replace the float32 type + $SED -i -e "s/${SEARCH}/${REPLACE}/g" ${file} + # reformat the code + go fmt ${file} + fi +done + + +###################### +# Change Endpoint details to map[string]interface{} +###################### +MODELS=`find ${OUTDIR}/models -type f -name "model_api_service_instance_spec_routing.go"` + +SEARCH="\s*Details.*$" +REPLACE="Details map[string]interface{} \`json:\"details,omitempty\"\`" for file in ${MODELS}; do if grep -e ${SEARCH} ${file} >> /dev/null; then # add a comment to the code From 8763f6c4f2b0b03ce8316c73a93ebd99cdcda18b Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Thu, 3 Nov 2022 12:42:08 -0700 Subject: [PATCH 6/8] APIGOV-24037 - enhance spec parser tests --- pkg/apic/specparser_test.go | 21 +- .../petstore-openapi-bad-version.json | 1231 +++++++++++++++++ pkg/apic/testdata/petstore-openapi2.yaml | 2 +- .../petstore-swagger-bad-version.json | 1053 ++++++++++++++ 4 files changed, 2302 insertions(+), 5 deletions(-) create mode 100644 pkg/apic/testdata/petstore-openapi-bad-version.json create mode 100644 pkg/apic/testdata/petstore-swagger-bad-version.json diff --git a/pkg/apic/specparser_test.go b/pkg/apic/specparser_test.go index cebe061ce..7b8542be5 100644 --- a/pkg/apic/specparser_test.go +++ b/pkg/apic/specparser_test.go @@ -34,7 +34,7 @@ func TestSpecDiscovery(t *testing.T) { name: "Protobuf input type with OAS2 Spec", inputFile: "./testdata/petstore-openapi2.yaml", parseErr: true, - inputType: Protobuf, + inputType: AsyncAPI, }, { name: "OAS3 input type with WSDL Spec", @@ -46,13 +46,23 @@ func TestSpecDiscovery(t *testing.T) { name: "AsyncAPI input type with Protobuf Spec", inputFile: "./testdata/petstore.proto", parseErr: true, - inputType: AsyncAPI, + inputType: Oas2, }, { name: "Protobuf input type with AsyncAPI Spec", inputFile: "./testdata/asyncapi-sample.yaml", parseErr: true, - inputType: Protobuf, + inputType: Wsdl, + }, + { + name: "No input type bad OAS version creates Unstructured", + inputFile: "./testdata/petstore-openapi-bad-version.json", + expectedType: Unstructured, + }, + { + name: "No input type bad Swagger version creates Unstructured", + inputFile: "./testdata/petstore-swagger-bad-version.json", + expectedType: Unstructured, }, { name: "No input type OAS3 Spec", @@ -80,7 +90,7 @@ func TestSpecDiscovery(t *testing.T) { expectedType: Protobuf, }, { - name: "No input type AsyncAPI Spec", + name: "No input type AsyncAPI Spec YAML", inputFile: "./testdata/asyncapi-sample.yaml", expectedType: AsyncAPI, }, @@ -102,6 +112,9 @@ func TestSpecDiscovery(t *testing.T) { specProcessor := specParser.GetSpecProcessor() assert.NotNil(t, specProcessor) assert.Equal(t, tc.expectedType, specProcessor.getResourceType()) + if tc.expectedType != specProcessor.getResourceType() { + return + } ok := false switch tc.expectedType { case Oas3: diff --git a/pkg/apic/testdata/petstore-openapi-bad-version.json b/pkg/apic/testdata/petstore-openapi-bad-version.json new file mode 100644 index 000000000..eba9926da --- /dev/null +++ b/pkg/apic/testdata/petstore-openapi-bad-version.json @@ -0,0 +1,1231 @@ +{ + "openapi": "1.0.2", + "info": { + "title": "Swagger Petstore - OpenAPI 3.0", + "description": "This is a sample Pet Store Server based on the OpenAPI 3.0 specification. You can find out more about\nSwagger at [http://swagger.io](http://swagger.io). In the third iteration of the pet store, we've switched to the design first approach!\nYou can now help us improve the API whether it's by making changes to the definition itself or to the code.\nThat way, with time, we can improve the API in general, and expose some of the new features in OAS3.\n\nSome useful links:\n- [The Pet Store repository](https://github.com/swagger-api/swagger-petstore)\n- [The source API definition for the Pet Store](https://github.com/swagger-api/swagger-petstore/blob/master/src/main/resources/openapi.yaml) ", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "email": "apiteam@swagger.io" + }, + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.html" + }, + "version": "1.0.4" + }, + "externalDocs": { + "description": "Find out more about Swagger", + "url": "http://swagger.io" + }, + "servers": [ + { + "url": "http://petstore.swagger.io:8080/api/v3" + }, + { + "url": "http://petstore.swagger.io/api/v3" + }, + { + "url": "https://petstore.swagger.io/api/v3" + } + ], + "tags": [ + { + "name": "pet", + "description": "Everything about your Pets", + "externalDocs": { + "description": "Find out more", + "url": "http://swagger.io" + } + }, + { + "name": "store", + "description": "Operations about user" + }, + { + "name": "user", + "description": "Access to Petstore orders", + "externalDocs": { + "description": "Find out more about our store", + "url": "http://swagger.io" + } + } + ], + "paths": { + "/pet": { + "put": { + "tags": [ + "pet" + ], + "summary": "Update an existing pet", + "description": "Update an existing pet by Id", + "operationId": "updatePet", + "requestBody": { + "description": "Update an existent pet in the store", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/x-www-form-urlencoded": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + } + }, + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Pet not found" + }, + "405": { + "description": "Validation exception" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + }, + "post": { + "tags": [ + "pet" + ], + "summary": "Add a new pet to the store", + "description": "Add a new pet to the store", + "operationId": "addPet", + "requestBody": { + "description": "Create a new pet in the store", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/x-www-form-urlencoded": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + } + }, + "405": { + "description": "Invalid input" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/findByStatus": { + "get": { + "tags": [ + "pet" + ], + "summary": "Finds Pets by status", + "description": "Multiple status values can be provided with comma separated strings", + "operationId": "findPetsByStatus", + "parameters": [ + { + "name": "status", + "in": "query", + "description": "Status values that need to be considered for filter", + "required": false, + "explode": true, + "schema": { + "type": "string", + "default": "available", + "enum": [ + "available", + "pending", + "sold" + ] + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/xml": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Pet" + } + } + } + } + }, + "400": { + "description": "Invalid status value" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/findByTags": { + "get": { + "tags": [ + "pet" + ], + "summary": "Finds Pets by tags", + "description": "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", + "operationId": "findPetsByTags", + "parameters": [ + { + "name": "tags", + "in": "query", + "description": "Tags to filter by", + "required": false, + "explode": true, + "schema": { + "type": "array", + "items": { + "type": "string" + } + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/xml": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Pet" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Pet" + } + } + } + } + }, + "400": { + "description": "Invalid tag value" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/{petId}": { + "get": { + "tags": [ + "pet" + ], + "summary": "Find pet by ID", + "description": "Returns a single pet", + "operationId": "getPetById", + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet to return", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + } + }, + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Pet not found" + } + }, + "security": [ + { + "api_key": [] + }, + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + }, + "post": { + "tags": [ + "pet" + ], + "summary": "Updates a pet in the store with form data", + "description": "", + "operationId": "updatePetWithForm", + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet that needs to be updated", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "name", + "in": "query", + "description": "Name of pet that needs to be updated", + "schema": { + "type": "string" + } + }, + { + "name": "status", + "in": "query", + "description": "Status of pet that needs to be updated", + "schema": { + "type": "string" + } + } + ], + "responses": { + "405": { + "description": "Invalid input" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + }, + "delete": { + "tags": [ + "pet" + ], + "summary": "Deletes a pet", + "description": "", + "operationId": "deletePet", + "parameters": [ + { + "name": "api_key", + "in": "header", + "description": "", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "petId", + "in": "path", + "description": "Pet id to delete", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "400": { + "description": "Invalid pet value" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/{petId}/uploadImage": { + "post": { + "tags": [ + "pet" + ], + "summary": "uploads an image", + "description": "", + "operationId": "uploadFile", + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet to update", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "additionalMetadata", + "in": "query", + "description": "Additional Metadata", + "required": false, + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "content": { + "application/octet-stream": { + "schema": { + "type": "string", + "format": "binary" + } + } + } + }, + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ApiResponse" + } + } + } + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/store/inventory": { + "get": { + "tags": [ + "store" + ], + "summary": "Returns pet inventories by status", + "description": "Returns a map of status codes to quantities", + "operationId": "getInventory", + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "object", + "additionalProperties": { + "type": "integer", + "format": "int32" + } + } + } + } + } + }, + "security": [ + { + "api_key": [] + } + ] + } + }, + "/store/order": { + "post": { + "tags": [ + "store" + ], + "summary": "Place an order for a pet", + "description": "Place a new order in the store", + "operationId": "placeOrder", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Order" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Order" + } + }, + "application/x-www-form-urlencoded": { + "schema": { + "$ref": "#/components/schemas/Order" + } + } + } + }, + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Order" + } + } + } + }, + "405": { + "description": "Invalid input" + } + } + } + }, + "/store/order/{orderId}": { + "get": { + "tags": [ + "store" + ], + "summary": "Find purchase order by ID", + "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", + "operationId": "getOrderById", + "parameters": [ + { + "name": "orderId", + "in": "path", + "description": "ID of order that needs to be fetched", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Order" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/Order" + } + } + } + }, + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Order not found" + } + } + }, + "delete": { + "tags": [ + "store" + ], + "summary": "Delete purchase order by ID", + "description": "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", + "operationId": "deleteOrder", + "parameters": [ + { + "name": "orderId", + "in": "path", + "description": "ID of the order that needs to be deleted", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + } + ], + "responses": { + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Order not found" + } + } + } + }, + "/user": { + "post": { + "tags": [ + "user" + ], + "summary": "Create user", + "description": "This can only be done by the logged in user.", + "operationId": "createUser", + "requestBody": { + "description": "Created user object", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/x-www-form-urlencoded": { + "schema": { + "$ref": "#/components/schemas/User" + } + } + } + }, + "responses": { + "default": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/User" + } + } + } + } + } + } + }, + "/user/createWithList": { + "post": { + "tags": [ + "user" + ], + "summary": "Creates list of users with given input array", + "description": "Creates list of users with given input array", + "operationId": "createUsersWithListInput", + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/User" + } + } + } + } + }, + "responses": { + "200": { + "description": "Successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/User" + } + } + } + }, + "default": { + "description": "successful operation" + } + } + } + }, + "/user/login": { + "get": { + "tags": [ + "user" + ], + "summary": "Logs user into the system", + "description": "", + "operationId": "loginUser", + "parameters": [ + { + "name": "username", + "in": "query", + "description": "The user name for login", + "required": false, + "schema": { + "type": "string" + } + }, + { + "name": "password", + "in": "query", + "description": "The password for login in clear text", + "required": false, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "headers": { + "X-Rate-Limit": { + "description": "calls per hour allowed by the user", + "schema": { + "type": "integer", + "format": "int32" + } + }, + "X-Expires-After": { + "description": "date in UTC when toekn expires", + "schema": { + "type": "string", + "format": "date-time" + } + } + }, + "content": { + "application/xml": { + "schema": { + "type": "string" + } + }, + "application/json": { + "schema": { + "type": "string" + } + } + } + }, + "400": { + "description": "Invalid username/password supplied" + } + } + } + }, + "/user/logout": { + "get": { + "tags": [ + "user" + ], + "summary": "Logs out current logged in user session", + "description": "", + "operationId": "logoutUser", + "parameters": [], + "responses": { + "default": { + "description": "successful operation" + } + } + } + }, + "/user/{username}": { + "get": { + "tags": [ + "user" + ], + "summary": "Get user by user name", + "description": "", + "operationId": "getUserByName", + "parameters": [ + { + "name": "username", + "in": "path", + "description": "The name that needs to be fetched. Use user1 for testing. ", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "content": { + "application/xml": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/User" + } + } + } + }, + "400": { + "description": "Invalid username supplied" + }, + "404": { + "description": "User not found" + } + } + }, + "put": { + "tags": [ + "user" + ], + "summary": "Update user", + "description": "This can only be done by the logged in user.", + "operationId": "updateUser", + "parameters": [ + { + "name": "username", + "in": "path", + "description": "name that need to be deleted", + "required": true, + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "description": "Update an existent user in the store", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/User" + } + }, + "application/x-www-form-urlencoded": { + "schema": { + "$ref": "#/components/schemas/User" + } + } + } + }, + "responses": { + "default": { + "description": "successful operation" + } + } + }, + "delete": { + "tags": [ + "user" + ], + "summary": "Delete user", + "description": "This can only be done by the logged in user.", + "operationId": "deleteUser", + "parameters": [ + { + "name": "username", + "in": "path", + "description": "The name that needs to be deleted", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "400": { + "description": "Invalid username supplied" + }, + "404": { + "description": "User not found" + } + } + } + } + }, + "components": { + "schemas": { + "Order": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64", + "example": 10 + }, + "petId": { + "type": "integer", + "format": "int64", + "example": 198772 + }, + "quantity": { + "type": "integer", + "format": "int32", + "example": 7 + }, + "shipDate": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string", + "description": "Order Status", + "example": "approved", + "enum": [ + "placed", + "approved", + "delivered" + ] + }, + "complete": { + "type": "boolean" + } + }, + "xml": { + "name": "order" + } + }, + "Customer": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64", + "example": 100000 + }, + "username": { + "type": "string", + "example": "fehguy" + }, + "address": { + "type": "array", + "xml": { + "name": "addresses", + "wrapped": true + }, + "items": { + "$ref": "#/components/schemas/Address" + } + } + }, + "xml": { + "name": "customer" + } + }, + "Address": { + "type": "object", + "properties": { + "street": { + "type": "string", + "example": "437 Lytton" + }, + "city": { + "type": "string", + "example": "Palo Alto" + }, + "state": { + "type": "string", + "example": "CA" + }, + "zip": { + "type": "string", + "example": "94301" + } + }, + "xml": { + "name": "address" + } + }, + "Category": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64", + "example": 1 + }, + "name": { + "type": "string", + "example": "Dogs" + } + }, + "xml": { + "name": "category" + } + }, + "User": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64", + "example": 10 + }, + "username": { + "type": "string", + "example": "theUser" + }, + "firstName": { + "type": "string", + "example": "John" + }, + "lastName": { + "type": "string", + "example": "James" + }, + "email": { + "type": "string", + "example": "john@email.com" + }, + "password": { + "type": "string", + "example": "12345" + }, + "phone": { + "type": "string", + "example": "12345" + }, + "userStatus": { + "type": "integer", + "description": "User Status", + "format": "int32", + "example": 1 + } + }, + "xml": { + "name": "user" + } + }, + "Tag": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "name": { + "type": "string" + } + }, + "xml": { + "name": "tag" + } + }, + "Pet": { + "required": [ + "name", + "photoUrls" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64", + "example": 10 + }, + "name": { + "type": "string", + "example": "doggie" + }, + "category": { + "$ref": "#/components/schemas/Category" + }, + "photoUrls": { + "type": "array", + "xml": { + "wrapped": true + }, + "items": { + "type": "string", + "xml": { + "name": "photoUrl" + } + } + }, + "tags": { + "type": "array", + "xml": { + "wrapped": true + }, + "items": { + "$ref": "#/components/schemas/Tag" + } + }, + "status": { + "type": "string", + "description": "pet status in the store", + "enum": [ + "available", + "pending", + "sold" + ] + } + }, + "xml": { + "name": "pet" + } + }, + "ApiResponse": { + "type": "object", + "properties": { + "code": { + "type": "integer", + "format": "int32" + }, + "type": { + "type": "string" + }, + "message": { + "type": "string" + } + }, + "xml": { + "name": "##default" + } + } + }, + "requestBodies": { + "Pet": { + "description": "Pet object that needs to be added to the store", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + }, + "application/xml": { + "schema": { + "$ref": "#/components/schemas/Pet" + } + } + } + }, + "UserArray": { + "description": "List of user object", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/User" + } + } + } + } + } + }, + "securitySchemes": { + "petstore_auth": { + "type": "oauth2", + "flows": { + "implicit": { + "authorizationUrl": "https://petstore3.swagger.io/oauth/authorize", + "scopes": { + "write:pets": "modify pets in your account", + "read:pets": "read your pets" + } + } + } + }, + "api_key": { + "type": "apiKey", + "name": "api_key", + "in": "header" + } + } + } +} \ No newline at end of file diff --git a/pkg/apic/testdata/petstore-openapi2.yaml b/pkg/apic/testdata/petstore-openapi2.yaml index 34dd201ed..5e88a3b11 100644 --- a/pkg/apic/testdata/petstore-openapi2.yaml +++ b/pkg/apic/testdata/petstore-openapi2.yaml @@ -1,4 +1,4 @@ -swagger: "2.0" +openapi: "2.0" info: version: 1.0.0 title: Swagger Petstore diff --git a/pkg/apic/testdata/petstore-swagger-bad-version.json b/pkg/apic/testdata/petstore-swagger-bad-version.json new file mode 100644 index 000000000..1b3bd2d74 --- /dev/null +++ b/pkg/apic/testdata/petstore-swagger-bad-version.json @@ -0,0 +1,1053 @@ +{ + "swagger": "1.0", + "info": { + "description": "This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.", + "version": "1.0.3", + "title": "Swagger Petstore", + "termsOfService": "http://swagger.io/terms/", + "contact": { + "email": "apiteam@swagger.io" + }, + "license": { + "name": "Apache 2.0", + "url": "http://www.apache.org/licenses/LICENSE-2.0.html" + } + }, + "host": "petstore.swagger.io", + "basePath": "/v2", + "tags": [ + { + "name": "pet", + "description": "Everything about your Pets", + "externalDocs": { + "description": "Find out more", + "url": "http://swagger.io" + } + }, + { + "name": "store", + "description": "Access to Petstore orders" + }, + { + "name": "user", + "description": "Operations about user", + "externalDocs": { + "description": "Find out more about our store", + "url": "http://swagger.io" + } + } + ], + "schemes": [ + "https" + ], + "paths": { + "/pet/{petId}": { + "get": { + "tags": [ + "pet" + ], + "summary": "Find pet by ID", + "description": "Returns a single pet", + "operationId": "getPetById", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet to return", + "required": true, + "type": "integer", + "format": "int64" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/Pet" + } + }, + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Pet not found" + } + }, + "security": [ + { + "api_key": [] + } + ] + }, + "post": { + "tags": [ + "pet" + ], + "summary": "Updates a pet in the store with form data", + "description": "", + "operationId": "updatePetWithForm", + "consumes": [ + "application/x-www-form-urlencoded" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet that needs to be updated", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "name", + "in": "formData", + "description": "Updated name of the pet", + "required": false, + "type": "string" + }, + { + "name": "status", + "in": "formData", + "description": "Updated status of the pet", + "required": false, + "type": "string" + } + ], + "responses": { + "405": { + "description": "Invalid input" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + }, + "delete": { + "tags": [ + "pet" + ], + "summary": "Deletes a pet", + "description": "", + "operationId": "deletePet", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "api_key", + "in": "header", + "required": false, + "type": "string" + }, + { + "name": "petId", + "in": "path", + "description": "Pet id to delete", + "required": true, + "type": "integer", + "format": "int64" + } + ], + "responses": { + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Pet not found" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/{petId}/uploadImage": { + "post": { + "tags": [ + "pet" + ], + "summary": "uploads an image", + "description": "", + "operationId": "uploadFile", + "consumes": [ + "multipart/form-data" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "name": "petId", + "in": "path", + "description": "ID of pet to update", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "additionalMetadata", + "in": "formData", + "description": "Additional data to pass to server", + "required": false, + "type": "string" + }, + { + "name": "file", + "in": "formData", + "description": "file to upload", + "required": false, + "type": "file" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/ApiResponse" + } + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet": { + "post": { + "tags": [ + "pet" + ], + "summary": "Add a new pet to the store", + "description": "", + "operationId": "addPet", + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "Pet object that needs to be added to the store", + "required": true, + "schema": { + "$ref": "#/definitions/Pet" + } + } + ], + "responses": { + "405": { + "description": "Invalid input" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + }, + "put": { + "tags": [ + "pet" + ], + "summary": "Update an existing pet", + "description": "", + "operationId": "updatePet", + "consumes": [ + "application/json", + "application/xml" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "Pet object that needs to be added to the store", + "required": true, + "schema": { + "$ref": "#/definitions/Pet" + } + } + ], + "responses": { + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Pet not found" + }, + "405": { + "description": "Validation exception" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/findByStatus": { + "get": { + "tags": [ + "pet" + ], + "summary": "Finds Pets by status", + "description": "Multiple status values can be provided with comma separated strings", + "operationId": "findPetsByStatus", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "status", + "in": "query", + "description": "Status values that need to be considered for filter", + "required": true, + "type": "array", + "items": { + "type": "string", + "enum": [ + "available", + "pending", + "sold" + ], + "default": "available" + }, + "collectionFormat": "multi" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/Pet" + } + } + }, + "400": { + "description": "Invalid status value" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ] + } + }, + "/pet/findByTags": { + "get": { + "tags": [ + "pet" + ], + "summary": "Finds Pets by tags", + "description": "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", + "operationId": "findPetsByTags", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "tags", + "in": "query", + "description": "Tags to filter by", + "required": true, + "type": "array", + "items": { + "type": "string" + }, + "collectionFormat": "multi" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/Pet" + } + } + }, + "400": { + "description": "Invalid tag value" + } + }, + "security": [ + { + "petstore_auth": [ + "write:pets", + "read:pets" + ] + } + ], + "deprecated": true + } + }, + "/store/inventory": { + "get": { + "tags": [ + "store" + ], + "summary": "Returns pet inventories by status", + "description": "Returns a map of status codes to quantities", + "operationId": "getInventory", + "produces": [ + "application/json" + ], + "parameters": [], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "type": "object", + "additionalProperties": { + "type": "integer", + "format": "int32" + } + } + } + }, + "security": [ + { + "api_key": [] + } + ] + } + }, + "/store/order/{orderId}": { + "get": { + "tags": [ + "store" + ], + "summary": "Find purchase order by ID", + "description": "For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions", + "operationId": "getOrderById", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "orderId", + "in": "path", + "description": "ID of pet that needs to be fetched", + "required": true, + "type": "integer", + "maximum": 10, + "minimum": 1, + "format": "int64" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/Order" + } + }, + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Order not found" + } + } + }, + "delete": { + "tags": [ + "store" + ], + "summary": "Delete purchase order by ID", + "description": "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors", + "operationId": "deleteOrder", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "orderId", + "in": "path", + "description": "ID of the order that needs to be deleted", + "required": true, + "type": "integer", + "minimum": 1, + "format": "int64" + } + ], + "responses": { + "400": { + "description": "Invalid ID supplied" + }, + "404": { + "description": "Order not found" + } + } + } + }, + "/store/order": { + "post": { + "tags": [ + "store" + ], + "summary": "Place an order for a pet", + "description": "", + "operationId": "placeOrder", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "order placed for purchasing the pet", + "required": true, + "schema": { + "$ref": "#/definitions/Order" + } + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/Order" + } + }, + "400": { + "description": "Invalid Order" + } + } + } + }, + "/user/{username}": { + "get": { + "tags": [ + "user" + ], + "summary": "Get user by user name", + "description": "", + "operationId": "getUserByName", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "username", + "in": "path", + "description": "The name that needs to be fetched. Use user1 for testing. ", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "successful operation", + "schema": { + "$ref": "#/definitions/User" + } + }, + "400": { + "description": "Invalid username supplied" + }, + "404": { + "description": "User not found" + } + } + }, + "put": { + "tags": [ + "user" + ], + "summary": "Updated user", + "description": "This can only be done by the logged in user.", + "operationId": "updateUser", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "username", + "in": "path", + "description": "name that need to be updated", + "required": true, + "type": "string" + }, + { + "in": "body", + "name": "body", + "description": "Updated user object", + "required": true, + "schema": { + "$ref": "#/definitions/User" + } + } + ], + "responses": { + "400": { + "description": "Invalid user supplied" + }, + "404": { + "description": "User not found" + } + } + }, + "delete": { + "tags": [ + "user" + ], + "summary": "Delete user", + "description": "This can only be done by the logged in user.", + "operationId": "deleteUser", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "username", + "in": "path", + "description": "The name that needs to be deleted", + "required": true, + "type": "string" + } + ], + "responses": { + "400": { + "description": "Invalid username supplied" + }, + "404": { + "description": "User not found" + } + } + } + }, + "/user/login": { + "get": { + "tags": [ + "user" + ], + "summary": "Logs user into the system", + "description": "", + "operationId": "loginUser", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "name": "username", + "in": "query", + "description": "The user name for login", + "required": true, + "type": "string" + }, + { + "name": "password", + "in": "query", + "description": "The password for login in clear text", + "required": true, + "type": "string" + } + ], + "responses": { + "200": { + "description": "successful operation", + "headers": { + "X-Expires-After": { + "type": "string", + "format": "date-time", + "description": "date in UTC when token expires" + }, + "X-Rate-Limit": { + "type": "integer", + "format": "int32", + "description": "calls per hour allowed by the user" + } + }, + "schema": { + "type": "string" + } + }, + "400": { + "description": "Invalid username/password supplied" + } + } + } + }, + "/user/logout": { + "get": { + "tags": [ + "user" + ], + "summary": "Logs out current logged in user session", + "description": "", + "operationId": "logoutUser", + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [], + "responses": { + "default": { + "description": "successful operation" + } + } + } + }, + "/user": { + "post": { + "tags": [ + "user" + ], + "summary": "Create user", + "description": "This can only be done by the logged in user.", + "operationId": "createUser", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "Created user object", + "required": true, + "schema": { + "$ref": "#/definitions/User" + } + } + ], + "responses": { + "default": { + "description": "successful operation" + } + } + } + }, + "/user/createWithArray": { + "post": { + "tags": [ + "user" + ], + "summary": "Creates list of users with given input array", + "description": "", + "operationId": "createUsersWithArrayInput", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "List of user object", + "required": true, + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/User" + } + } + } + ], + "responses": { + "default": { + "description": "successful operation" + } + } + } + }, + "/user/createWithList": { + "post": { + "tags": [ + "user" + ], + "summary": "Creates list of users with given input array", + "description": "", + "operationId": "createUsersWithListInput", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json", + "application/xml" + ], + "parameters": [ + { + "in": "body", + "name": "body", + "description": "List of user object", + "required": true, + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/User" + } + } + } + ], + "responses": { + "default": { + "description": "successful operation" + } + } + } + } + }, + "securityDefinitions": { + "api_key": { + "type": "apiKey", + "name": "api_key", + "in": "header" + }, + "petstore_auth": { + "type": "oauth2", + "authorizationUrl": "https://petstore.swagger.io/oauth/authorize", + "flow": "implicit", + "scopes": { + "read:pets": "read your pets", + "write:pets": "modify pets in your account" + } + } + }, + "definitions": { + "Category": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "name": { + "type": "string" + } + }, + "xml": { + "name": "Category" + } + }, + "Pet": { + "type": "object", + "required": [ + "name", + "photoUrls" + ], + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "category": { + "$ref": "#/definitions/Category" + }, + "name": { + "type": "string", + "example": "doggie" + }, + "photoUrls": { + "type": "array", + "xml": { + "wrapped": true + }, + "items": { + "type": "string", + "xml": { + "name": "photoUrl" + } + } + }, + "tags": { + "type": "array", + "xml": { + "wrapped": true + }, + "items": { + "xml": { + "name": "tag" + }, + "$ref": "#/definitions/Tag" + } + }, + "status": { + "type": "string", + "description": "pet status in the store", + "enum": [ + "available", + "pending", + "sold" + ] + } + }, + "xml": { + "name": "Pet" + } + }, + "Tag": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "name": { + "type": "string" + } + }, + "xml": { + "name": "Tag" + } + }, + "ApiResponse": { + "type": "object", + "properties": { + "code": { + "type": "integer", + "format": "int32" + }, + "type": { + "type": "string" + }, + "message": { + "type": "string" + } + } + }, + "Order": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "petId": { + "type": "integer", + "format": "int64" + }, + "quantity": { + "type": "integer", + "format": "int32" + }, + "shipDate": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string", + "description": "Order Status", + "enum": [ + "placed", + "approved", + "delivered" + ] + }, + "complete": { + "type": "boolean" + } + }, + "xml": { + "name": "Order" + } + }, + "User": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int64" + }, + "username": { + "type": "string" + }, + "firstName": { + "type": "string" + }, + "lastName": { + "type": "string" + }, + "email": { + "type": "string" + }, + "password": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "userStatus": { + "type": "integer", + "format": "int32", + "description": "User Status" + } + }, + "xml": { + "name": "User" + } + } + }, + "externalDocs": { + "description": "Find out more about Swagger", + "url": "http://swagger.io" + } +} \ No newline at end of file From ea048814b4e31d7a178592b3f3e1d0e21ad70847 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Thu, 3 Nov 2022 15:57:47 -0700 Subject: [PATCH 7/8] APIGOV-24037 - codegen --- .../management/v1alpha1/GraphQLDocument.go | 201 ++++++++++++++++++ pkg/apic/apiserver/clients/set.go | 5 + .../management/v1alpha1/GraphQLDocument.go | 173 +++++++++++++++ .../v1alpha1/model_graph_ql_document_spec.go | 16 ++ 4 files changed, 395 insertions(+) create mode 100644 pkg/apic/apiserver/clients/management/v1alpha1/GraphQLDocument.go create mode 100644 pkg/apic/apiserver/models/management/v1alpha1/GraphQLDocument.go create mode 100644 pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go diff --git a/pkg/apic/apiserver/clients/management/v1alpha1/GraphQLDocument.go b/pkg/apic/apiserver/clients/management/v1alpha1/GraphQLDocument.go new file mode 100644 index 000000000..487ac4ad0 --- /dev/null +++ b/pkg/apic/apiserver/clients/management/v1alpha1/GraphQLDocument.go @@ -0,0 +1,201 @@ +/* + * This file is automatically generated + */ + +package management + +import ( + "fmt" + + v1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/api/v1" + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" + m "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/management/v1alpha1" +) + +type GraphQLDocumentMergeFunc func(*m.GraphQLDocument, *m.GraphQLDocument) (*m.GraphQLDocument, error) + +// GraphQLDocumentMerge builds a merge option for an update operation +func GraphQLDocumentMerge(f GraphQLDocumentMergeFunc) v1.UpdateOption { + return v1.Merge(func(prev, new apiv1.Interface) (apiv1.Interface, error) { + p, n := &m.GraphQLDocument{}, &m.GraphQLDocument{} + + switch t := prev.(type) { + case *m.GraphQLDocument: + p = t + case *apiv1.ResourceInstance: + err := p.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialise prev resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise prev resource, unxexpected resource type: %T", t) + } + + switch t := new.(type) { + case *m.GraphQLDocument: + n = t + case *apiv1.ResourceInstance: + err := n.FromInstance(t) + if err != nil { + return nil, fmt.Errorf("merge: failed to unserialize new resource: %w", err) + } + default: + return nil, fmt.Errorf("merge: failed to unserialise new resource, unxexpected resource type: %T", t) + } + + return f(p, n) + }) +} + +// GraphQLDocumentClient - rest client for GraphQLDocument resources that have a defined resource scope +type GraphQLDocumentClient struct { + client v1.Scoped +} + +// UnscopedGraphQLDocumentClient - rest client for GraphQLDocument resources that do not have a defined scope +type UnscopedGraphQLDocumentClient struct { + client v1.Unscoped +} + +// NewGraphQLDocumentClient - creates a client that is not scoped to any resource +func NewGraphQLDocumentClient(c v1.Base) (*UnscopedGraphQLDocumentClient, error) { + + client, err := c.ForKind(m.GraphQLDocumentGVK()) + if err != nil { + return nil, err + } + + return &UnscopedGraphQLDocumentClient{client}, nil + +} + +// WithScope - sets the resource scope for the client +func (c *UnscopedGraphQLDocumentClient) WithScope(scope string) *GraphQLDocumentClient { + return &GraphQLDocumentClient{ + c.client.WithScope(scope), + } +} + +// Get - gets a resource by name +func (c *UnscopedGraphQLDocumentClient) Get(name string) (*m.GraphQLDocument, error) { + ri, err := c.client.Get(name) + if err != nil { + return nil, err + } + + service := &m.GraphQLDocument{} + service.FromInstance(ri) + + return service, nil +} + +// Update - updates a resource +func (c *UnscopedGraphQLDocumentClient) Update(res *m.GraphQLDocument, opts ...v1.UpdateOption) (*m.GraphQLDocument, error) { + ri, err := res.AsInstance() + if err != nil { + return nil, err + } + resource, err := c.client.Update(ri, opts...) + if err != nil { + return nil, err + } + + updated := &m.GraphQLDocument{} + + // Updates the resource in place + err = updated.FromInstance(resource) + if err != nil { + return nil, err + } + + return updated, nil +} + +// List - gets a list of resources +func (c *GraphQLDocumentClient) List(options ...v1.ListOptions) ([]*m.GraphQLDocument, error) { + riList, err := c.client.List(options...) + if err != nil { + return nil, err + } + + result := make([]*m.GraphQLDocument, len(riList)) + + for i := range riList { + result[i] = &m.GraphQLDocument{} + err := result[i].FromInstance(riList[i]) + if err != nil { + return nil, err + } + } + + return result, nil +} + +// Get - gets a resource by name +func (c *GraphQLDocumentClient) Get(name string) (*m.GraphQLDocument, error) { + ri, err := c.client.Get(name) + if err != nil { + return nil, err + } + + service := &m.GraphQLDocument{} + service.FromInstance(ri) + + return service, nil +} + +// Delete - deletes a resource +func (c *GraphQLDocumentClient) Delete(res *m.GraphQLDocument) error { + ri, err := res.AsInstance() + + if err != nil { + return err + } + + return c.client.Delete(ri) +} + +// Create - creates a resource +func (c *GraphQLDocumentClient) Create(res *m.GraphQLDocument, opts ...v1.CreateOption) (*m.GraphQLDocument, error) { + ri, err := res.AsInstance() + + if err != nil { + return nil, err + } + + cri, err := c.client.Create(ri, opts...) + if err != nil { + return nil, err + } + + created := &m.GraphQLDocument{} + + err = created.FromInstance(cri) + if err != nil { + return nil, err + } + + return created, err +} + +// Update - updates a resource +func (c *GraphQLDocumentClient) Update(res *m.GraphQLDocument, opts ...v1.UpdateOption) (*m.GraphQLDocument, error) { + ri, err := res.AsInstance() + if err != nil { + return nil, err + } + resource, err := c.client.Update(ri, opts...) + if err != nil { + return nil, err + } + + updated := &m.GraphQLDocument{} + + // Updates the resource in place + err = updated.FromInstance(resource) + if err != nil { + return nil, err + } + + return updated, nil +} diff --git a/pkg/apic/apiserver/clients/set.go b/pkg/apic/apiserver/clients/set.go index f71b86fda..170efe698 100644 --- a/pkg/apic/apiserver/clients/set.go +++ b/pkg/apic/apiserver/clients/set.go @@ -55,6 +55,7 @@ type Set struct { ExternalSecretManagementV1alpha1 *management_v1alpha1.UnscopedExternalSecretClient VirtualServiceManagementV1alpha1 *management_v1alpha1.UnscopedVirtualServiceClient OAS3DocumentManagementV1alpha1 *management_v1alpha1.UnscopedOAS3DocumentClient + GraphQLDocumentManagementV1alpha1 *management_v1alpha1.UnscopedGraphQLDocumentClient WebhookManagementV1alpha1 *management_v1alpha1.UnscopedWebhookClient ReleaseTagManagementV1alpha1 *management_v1alpha1.UnscopedReleaseTagClient CredentialRequestDefinitionManagementV1alpha1 *management_v1alpha1.UnscopedCredentialRequestDefinitionClient @@ -270,6 +271,10 @@ func New(b cAPIV1.Base) *Set { if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/management/v1alpha1.OAS3Document: %s", err)) } + s.GraphQLDocumentManagementV1alpha1, err = management_v1alpha1.NewGraphQLDocumentClient(b) + if err != nil { + panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/management/v1alpha1.GraphQLDocument: %s", err)) + } s.WebhookManagementV1alpha1, err = management_v1alpha1.NewWebhookClient(b) if err != nil { panic(fmt.Sprintf("Failed to create client for github.com/Axway/agent-sdk/pkg/apic/apiserver/clients/management/v1alpha1.Webhook: %s", err)) diff --git a/pkg/apic/apiserver/models/management/v1alpha1/GraphQLDocument.go b/pkg/apic/apiserver/models/management/v1alpha1/GraphQLDocument.go new file mode 100644 index 000000000..71d210bde --- /dev/null +++ b/pkg/apic/apiserver/models/management/v1alpha1/GraphQLDocument.go @@ -0,0 +1,173 @@ +/* + * This file is automatically generated + */ + +package management + +import ( + "encoding/json" + "fmt" + + apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +var ( + _GraphQLDocumentGVK = apiv1.GroupVersionKind{ + GroupKind: apiv1.GroupKind{ + Group: "management", + Kind: "GraphQLDocument", + }, + APIVersion: "v1alpha1", + } + + GraphQLDocumentScopes = []string{"VirtualAPI", "VirtualAPIRelease"} +) + +const GraphQLDocumentResourceName = "graphqldocuments" + +func GraphQLDocumentGVK() apiv1.GroupVersionKind { + return _GraphQLDocumentGVK +} + +func init() { + apiv1.RegisterGVK(_GraphQLDocumentGVK, GraphQLDocumentScopes[0], GraphQLDocumentResourceName) +} + +// GraphQLDocument Resource +type GraphQLDocument struct { + apiv1.ResourceMeta + Owner *apiv1.Owner `json:"owner"` + Spec interface{} `json:"spec"` +} + +// NewGraphQLDocument creates an empty *GraphQLDocument +func NewGraphQLDocument(name, scopeKind, scopeName string) (*GraphQLDocument, error) { + validScope := false + for _, s := range GraphQLDocumentScopes { + if scopeKind == s { + validScope = true + break + } + } + if !validScope { + return nil, fmt.Errorf("scope '%s' not valid for GraphQLDocument kind", scopeKind) + } + + return &GraphQLDocument{ + ResourceMeta: apiv1.ResourceMeta{ + Name: name, + GroupVersionKind: _GraphQLDocumentGVK, + Metadata: apiv1.Metadata{ + Scope: apiv1.MetadataScope{ + Name: scopeName, + Kind: scopeKind, + }, + }, + }, + }, nil +} + +// GraphQLDocumentFromInstanceArray converts a []*ResourceInstance to a []*GraphQLDocument +func GraphQLDocumentFromInstanceArray(fromArray []*apiv1.ResourceInstance) ([]*GraphQLDocument, error) { + newArray := make([]*GraphQLDocument, 0) + for _, item := range fromArray { + res := &GraphQLDocument{} + err := res.FromInstance(item) + if err != nil { + return make([]*GraphQLDocument, 0), err + } + newArray = append(newArray, res) + } + + return newArray, nil +} + +// AsInstance converts a GraphQLDocument to a ResourceInstance +func (res *GraphQLDocument) AsInstance() (*apiv1.ResourceInstance, error) { + meta := res.ResourceMeta + meta.GroupVersionKind = GraphQLDocumentGVK() + res.ResourceMeta = meta + + m, err := json.Marshal(res) + if err != nil { + return nil, err + } + + instance := apiv1.ResourceInstance{} + err = json.Unmarshal(m, &instance) + if err != nil { + return nil, err + } + + return &instance, nil +} + +// FromInstance converts a ResourceInstance to a GraphQLDocument +func (res *GraphQLDocument) FromInstance(ri *apiv1.ResourceInstance) error { + if ri == nil { + res = nil + return nil + } + var err error + rawResource := ri.GetRawResource() + if rawResource == nil { + rawResource, err = json.Marshal(ri) + if err != nil { + return err + } + } + err = json.Unmarshal(rawResource, res) + return err +} + +// MarshalJSON custom marshaller to handle sub resources +func (res *GraphQLDocument) MarshalJSON() ([]byte, error) { + m, err := json.Marshal(&res.ResourceMeta) + if err != nil { + return nil, err + } + + var out map[string]interface{} + err = json.Unmarshal(m, &out) + if err != nil { + return nil, err + } + + out["owner"] = res.Owner + out["spec"] = res.Spec + + return json.Marshal(out) +} + +// UnmarshalJSON custom unmarshaller to handle sub resources +func (res *GraphQLDocument) UnmarshalJSON(data []byte) error { + var err error + + aux := &apiv1.ResourceInstance{} + err = json.Unmarshal(data, aux) + if err != nil { + return err + } + + res.ResourceMeta = aux.ResourceMeta + res.Owner = aux.Owner + + // ResourceInstance holds the spec as a map[string]interface{}. + // Convert it to bytes, then convert to the spec type for the resource. + sr, err := json.Marshal(aux.Spec) + if err != nil { + return err + } + + err = json.Unmarshal(sr, &res.Spec) + if err != nil { + return err + } + + return nil +} + +// PluralName returns the plural name of the resource +func (res *GraphQLDocument) PluralName() string { + return GraphQLDocumentResourceName +} diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go new file mode 100644 index 000000000..859735dae --- /dev/null +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package management + +// GraphQlDocumentSpec struct for GraphQlDocumentSpec +type GraphQlDocumentSpec struct { + VirtualService string `json:"virtualService"` + Graphql map[string]interface{} `json:"graphql"` +} From d8188aff69e40f8f1563db1db2b97434d6a60ea3 Mon Sep 17 00:00:00 2001 From: Jason Collins Date: Fri, 4 Nov 2022 11:17:34 -0700 Subject: [PATCH 8/8] APIGOV-24037 - regen again --- .../models/catalog/v1/model_category_spec.go | 2 +- .../models/catalog/v1/model_document_spec.go | 2 +- .../v1/model_document_spec_sections.go | 2 +- .../catalog/v1/model_document_status.go | 2 +- .../catalog/v1/model_marketplace_spec.go | 2 +- .../catalog/v1/model_product_overview_spec.go | 2 +- .../model_product_overview_spec_documents.go | 2 +- .../catalog/v1/model_product_references.go | 2 +- .../v1/model_product_references_assets.go | 2 +- .../v1/model_product_references_release.go | 2 +- .../catalog/v1/model_product_release_spec.go | 2 +- .../v1/model_product_release_spec_assets.go | 2 +- .../v1/model_product_release_spec_release.go | 2 +- .../v1/model_product_release_status.go | 2 +- .../v1/model_product_release_status_error.go | 4 +-- .../model_product_release_status_pending.go | 4 +-- ...del_product_release_status_pending_meta.go | 16 +++++++++++ .../model_product_release_status_success.go | 4 +-- .../models/catalog/v1/model_product_spec.go | 2 +- .../catalog/v1/model_product_spec_assets.go | 2 +- .../v1/model_product_spec_auto_release.go | 2 +- .../catalog/v1/model_product_spec_filters.go | 2 +- .../models/catalog/v1/model_product_status.go | 2 +- .../catalog/v1/model_product_status_meta.go | 2 +- .../v1/model_product_status_reasons.go | 2 +- .../models/catalog/v1/model_quota_spec.go | 2 +- .../models/catalog/v1/model_quota_status.go | 2 +- .../models/catalog/v1/model_resource_spec.go | 2 +- .../catalog/v1/model_support_contact_spec.go | 2 +- .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- .../v1alpha1/model_application_marketplace.go | 2 +- .../model_application_marketplace_resource.go | 2 +- ...plication_marketplace_resource_metadata.go | 2 +- ..._application_marketplace_resource_owner.go | 2 +- ...marketplace_resource_owner_organization.go | 2 +- .../v1alpha1/model_application_spec.go | 2 +- .../model_application_spec_security.go | 2 +- .../catalog/v1alpha1/model_asset_access.go | 2 +- .../v1alpha1/model_asset_mapping_spec.go | 2 +- .../model_asset_mapping_spec_inputs.go | 2 +- .../v1alpha1/model_asset_mapping_status.go | 2 +- .../model_asset_mapping_status_outputs.go | 2 +- .../model_asset_mapping_status_resource.go | 2 +- ..._mapping_status_resource_asset_resource.go | 2 +- ...del_asset_mapping_status_resource_stage.go | 2 +- .../model_asset_mapping_status_source.go | 2 +- ...el_asset_mapping_status_source_resource.go | 2 +- ...ping_status_source_resource_api_service.go | 2 +- ...us_source_resource_api_service_instance.go | 2 +- ...us_source_resource_api_service_revision.go | 2 +- ..._source_resource_asset_mapping_template.go | 2 +- .../v1alpha1/model_asset_release_spec.go | 2 +- .../v1alpha1/model_asset_release_status.go | 2 +- .../model_asset_release_status_meta.go | 2 +- .../model_asset_release_status_reasons.go | 2 +- .../v1alpha1/model_asset_request_approval.go | 2 +- .../model_asset_request_approval_state.go | 2 +- ..._asset_request_definition_authorization.go | 2 +- .../model_asset_request_definition_spec.go | 4 +-- ...asset_request_definition_spec_provision.go | 4 +-- .../model_asset_request_marketplace.go | 2 +- ...odel_asset_request_marketplace_resource.go | 2 +- ...t_request_marketplace_resource_metadata.go | 2 +- ...sset_request_marketplace_resource_owner.go | 6 ++-- ...marketplace_resource_owner_organization.go | 16 +++++++++++ .../model_asset_request_references.go | 2 +- .../v1alpha1/model_asset_request_spec.go | 3 +- .../v1alpha1/model_asset_request_status.go | 4 +-- .../model_asset_request_status_reasons.go | 28 +++++++++++++++++++ .../model_asset_resource_references.go | 2 +- .../v1alpha1/model_asset_resource_spec.go | 2 +- .../model_asset_resource_spec_access_info.go | 2 +- .../catalog/v1alpha1/model_asset_spec.go | 2 +- .../v1alpha1/model_asset_spec_auto_release.go | 2 +- .../catalog/v1alpha1/model_asset_status.go | 2 +- .../v1alpha1/model_asset_status_meta.go | 2 +- .../v1alpha1/model_asset_status_reasons.go | 2 +- .../model_authorization_profile_references.go | 2 +- .../model_authorization_profile_spec.go | 2 +- .../catalog/v1alpha1/model_category_spec.go | 2 +- .../v1alpha1/model_credential_marketplace.go | 2 +- .../model_credential_marketplace_resource.go | 6 ++-- ...redential_marketplace_resource_metadata.go | 18 ++++++++++++ ...l_credential_marketplace_resource_owner.go | 6 ++-- ...marketplace_resource_owner_organization.go | 16 +++++++++++ .../v1alpha1/model_credential_policies.go | 2 +- .../model_credential_policies_expiry.go | 2 +- .../v1alpha1/model_credential_references.go | 2 +- ...redential_request_definition_references.go | 2 +- ...odel_credential_request_definition_spec.go | 4 +-- ...ntial_request_definition_spec_provision.go | 4 +-- ...uest_definition_spec_provision_policies.go | 2 +- ...finition_spec_provision_policies_expiry.go | 2 +- ..._spec_provision_policies_expiry_actions.go | 2 +- .../catalog/v1alpha1/model_credential_spec.go | 4 +-- .../v1alpha1/model_credential_spec_state.go | 2 +- .../v1alpha1/model_credential_state.go | 2 +- .../v1alpha1/model_credential_status.go | 2 +- .../model_credential_status_reasons.go | 7 +++-- .../catalog/v1alpha1/model_document_spec.go | 2 +- .../v1alpha1/model_document_spec_sections.go | 2 +- .../catalog/v1alpha1/model_document_status.go | 2 +- .../v1alpha1/model_marketplace_spec.go | 2 +- .../v1alpha1/model_product_overview_spec.go | 2 +- .../model_product_overview_spec_documents.go | 2 +- .../v1alpha1/model_product_plan_references.go | 2 +- .../model_product_plan_references_product.go | 2 +- .../v1alpha1/model_product_plan_spec.go | 2 +- .../model_product_plan_spec_billing.go | 2 +- .../model_product_plan_spec_features.go | 2 +- .../model_product_plan_spec_subscription.go | 2 +- ...product_plan_spec_subscription_interval.go | 2 +- .../v1alpha1/model_product_plan_status.go | 4 +-- .../model_product_plan_status_reasons.go | 28 +++++++++++++++++++ .../v1alpha1/model_product_plan_unit_spec.go | 2 +- .../v1alpha1/model_product_references.go | 2 +- .../model_product_references_assets.go | 2 +- .../model_product_references_release.go | 2 +- .../v1alpha1/model_product_release_spec.go | 2 +- .../model_product_release_spec_assets.go | 2 +- .../model_product_release_spec_release.go | 2 +- .../v1alpha1/model_product_release_status.go | 2 +- .../model_product_release_status_error.go | 4 +-- .../model_product_release_status_pending.go | 4 +-- ...del_product_release_status_pending_meta.go | 16 +++++++++++ .../model_product_release_status_success.go | 4 +-- .../catalog/v1alpha1/model_product_spec.go | 2 +- .../v1alpha1/model_product_spec_assets.go | 2 +- .../model_product_spec_auto_release.go | 2 +- .../v1alpha1/model_product_spec_filters.go | 2 +- .../catalog/v1alpha1/model_product_status.go | 2 +- .../v1alpha1/model_product_status_meta.go | 2 +- .../v1alpha1/model_product_status_reasons.go | 2 +- .../v1alpha1/model_product_visibility_spec.go | 2 +- .../model_product_visibility_spec_products.go | 2 +- .../model_published_product_references.go | 2 +- ...el_published_product_references_release.go | 2 +- .../v1alpha1/model_published_product_spec.go | 2 +- .../model_published_product_spec_product.go | 2 +- .../catalog/v1alpha1/model_quota_spec.go | 2 +- .../catalog/v1alpha1/model_quota_status.go | 2 +- .../v1alpha1/model_release_tag_spec.go | 2 +- .../v1alpha1/model_release_tag_status.go | 2 +- .../catalog/v1alpha1/model_resource_spec.go | 2 +- .../catalog/v1alpha1/model_secret_spec.go | 4 +-- .../catalog/v1alpha1/model_stage_spec.go | 2 +- .../v1alpha1/model_subscription_approval.go | 2 +- .../model_subscription_marketplace.go | 6 ++-- ...model_subscription_marketplace_resource.go | 16 +++++++++++ ...scription_marketplace_resource_metadata.go | 18 ++++++++++++ ...subscription_marketplace_resource_owner.go | 19 +++++++++++++ ...marketplace_resource_owner_organization.go | 16 +++++++++++ .../v1alpha1/model_subscription_spec.go | 2 +- .../v1alpha1/model_subscription_spec_plan.go | 2 +- .../v1alpha1/model_subscription_status.go | 2 +- .../model_subscription_status_reasons.go | 7 +++-- .../v1alpha1/model_support_contact_spec.go | 2 +- .../catalog/v1alpha1/model_webhook_spec.go | 4 +-- .../v1alpha1/model_webhook_spec_auth.go | 2 +- .../model_webhook_spec_auth_secret.go | 2 +- .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- .../model_command_line_interface_spec.go | 2 +- ...del_command_line_interface_spec_columns.go | 2 +- ...model_command_line_interface_spec_names.go | 2 +- .../model_resource_definition_spec.go | 2 +- ...del_resource_definition_spec_references.go | 2 +- ...esource_definition_spec_references_from.go | 2 +- ...ource_definition_spec_references_from_1.go | 2 +- ...finition_spec_references_from_resources.go | 2 +- ...definition_spec_references_to_resources.go | 2 +- .../model_resource_definition_spec_scope.go | 2 +- ..._resource_definition_spec_sub_resources.go | 2 +- .../model_resource_definition_version_spec.go | 4 +-- .../model_access_control_list_spec_rules.go | 2 +- ...model_access_control_list_spec_subjects.go | 2 +- ...ccess_request_definition_spec_provision.go | 4 +-- .../model_access_request_spec_quota.go | 2 +- .../v1alpha1/model_access_request_status.go | 2 +- .../model_access_request_status_reasons.go | 7 +++-- .../v1alpha1/model_amplify_config_spec.go | 2 +- .../model_amplify_config_spec_address.go | 2 +- .../model_amplify_jwt_auth_rule_spec.go | 2 +- .../model_amplify_jwt_auth_rule_spec_from.go | 2 +- .../model_amplify_jwt_auth_rule_spec_jwks.go | 2 +- .../model_amplify_o_auth2_auth_rule_spec.go | 2 +- .../model_amplify_runtime_config_spec.go | 4 +-- .../model_amplify_runtime_config_status.go | 2 +- .../v1alpha1/model_api_key_auth_rule_spec.go | 2 +- .../v1alpha1/model_api_service_details.go | 2 +- .../model_api_service_instance_spec.go | 2 +- ...odel_api_service_instance_spec_endpoint.go | 2 +- ...model_api_service_instance_spec_routing.go | 4 +-- .../model_api_service_revision_spec.go | 2 +- ...el_api_service_revision_spec_definition.go | 2 +- .../v1alpha1/model_api_service_spec.go | 2 +- .../v1alpha1/model_api_service_spec_icon.go | 2 +- .../v1alpha1/model_api_service_status.go | 2 +- .../v1alpha1/model_api_spec_spec.go | 2 +- .../model_api_spec_spec_definition.go | 2 +- .../v1alpha1/model_api_spec_spec_endpoints.go | 4 +-- .../v1alpha1/model_asset_mapping_spec.go | 2 +- .../model_asset_mapping_spec_inputs.go | 2 +- .../v1alpha1/model_asset_mapping_status.go | 2 +- .../model_asset_mapping_status_outputs.go | 2 +- .../model_asset_mapping_status_resource.go | 2 +- ..._mapping_status_resource_asset_resource.go | 2 +- ...del_asset_mapping_status_resource_stage.go | 2 +- .../model_asset_mapping_status_source.go | 2 +- ...el_asset_mapping_status_source_resource.go | 2 +- ...ping_status_source_resource_api_service.go | 2 +- ...us_source_resource_api_service_instance.go | 2 +- ...us_source_resource_api_service_revision.go | 2 +- ..._source_resource_asset_mapping_template.go | 2 +- .../model_asset_mapping_template_spec.go | 2 +- ...asset_mapping_template_spec_api_service.go | 4 +-- ...ping_template_spec_api_service_revision.go | 4 +-- ...i_service_revision_api_service_instance.go | 4 +-- ...model_asset_mapping_template_spec_asset.go | 2 +- ...del_asset_mapping_template_spec_filters.go | 2 +- .../model_consumer_instance_references.go | 2 +- .../v1alpha1/model_consumer_instance_spec.go | 2 +- ...nstance_spec_additional_data_properties.go | 2 +- .../model_consumer_instance_spec_icon.go | 2 +- ...del_consumer_instance_spec_subscription.go | 2 +- ...tance_spec_unstructured_data_properties.go | 2 +- .../model_consumer_instance_status.go | 2 +- .../model_consumer_instance_status_phase.go | 2 +- ...l_consumer_subscription_definition_spec.go | 2 +- ...mer_subscription_definition_spec_schema.go | 2 +- ...ption_definition_spec_schema_properties.go | 4 +-- .../v1alpha1/model_cors_rule_spec.go | 2 +- .../model_credential_policies_expiry.go | 2 +- .../v1alpha1/model_credential_references.go | 2 +- ...redential_request_definition_references.go | 2 +- ...finition_spec_provision_policies_expiry.go | 2 +- ..._spec_provision_policies_expiry_actions.go | 2 +- .../v1alpha1/model_credential_spec.go | 4 +-- .../v1alpha1/model_credential_spec_state.go | 2 +- .../v1alpha1/model_credential_state.go | 2 +- .../v1alpha1/model_credential_status.go | 4 +-- .../model_credential_status_reasons.go | 28 +++++++++++++++++++ .../v1alpha1/model_deployment_references.go | 2 +- .../v1alpha1/model_deployment_spec.go | 2 +- .../v1alpha1/model_deployment_status.go | 2 +- .../v1alpha1/model_discovery_agent_spec.go | 2 +- .../model_discovery_agent_spec_config.go | 2 +- .../model_discovery_agent_spec_logging.go | 2 +- .../v1alpha1/model_discovery_agent_status.go | 2 +- .../v1alpha1/model_environment_spec.go | 7 +++-- .../v1alpha1/model_environment_spec_icon.go | 2 +- .../v1alpha1/model_external_secret_spec.go | 2 +- ...odel_governance_agent_agentconfigstatus.go | 2 +- .../v1alpha1/model_governance_agent_spec.go | 4 +-- .../v1alpha1/model_governance_agent_status.go | 2 +- .../v1alpha1/model_graph_ql_document_spec.go | 7 +++-- .../v1alpha1/model_integration_spec.go | 2 +- .../v1alpha1/model_k8_s_cluster_spec.go | 2 +- .../v1alpha1/model_k8_s_resource_spec.go | 8 ++++-- ...del_k8_s_resource_spec_owner_references.go | 2 +- .../model_managed_application_marketplace.go | 2 +- ...anaged_application_marketplace_resource.go | 2 +- ...plication_marketplace_resource_metadata.go | 2 +- ..._application_marketplace_resource_owner.go | 2 +- ...marketplace_resource_owner_organization.go | 2 +- .../model_managed_application_references.go | 2 +- .../model_managed_application_spec.go | 2 +- ...model_managed_application_spec_security.go | 2 +- .../model_managed_application_status.go | 2 +- .../v1alpha1/model_mesh_discovery_spec.go | 2 +- .../v1alpha1/model_mesh_service_spec.go | 4 +-- .../model_mesh_service_spec_endpoints.go | 4 +-- .../v1alpha1/model_mesh_service_spec_ports.go | 2 +- .../v1alpha1/model_mesh_workload_spec.go | 4 +-- .../model_mesh_workload_spec_ports.go | 2 +- .../model_mesh_workload_spec_specs.go | 2 +- .../v1alpha1/model_oas3_document_spec.go | 7 +++-- .../v1alpha1/model_release_tag_spec.go | 2 +- .../v1alpha1/model_release_tag_status.go | 2 +- .../v1alpha1/model_resource_discovery_spec.go | 5 ++-- ...esource_discovery_spec_namespace_filter.go | 2 +- ...resource_discovery_spec_resource_filter.go | 5 ++-- .../v1alpha1/model_resource_hook_spec.go | 2 +- .../model_resource_hook_spec_scope.go | 2 +- .../model_resource_hook_spec_triggers.go | 2 +- .../management/v1alpha1/model_secret_spec.go | 4 +-- .../v1alpha1/model_spec_discovery_spec.go | 2 +- ...el_spec_discovery_spec_namespace_filter.go | 2 +- ...del_spec_discovery_spec_resource_filter.go | 5 ++-- .../model_spec_discovery_spec_targets.go | 2 +- ...spec_discovery_spec_targets_exact_paths.go | 4 +-- ..._discovery_spec_targets_from_annotation.go | 2 +- .../v1alpha1/model_traceability_agent_spec.go | 8 +++--- .../model_traceability_agent_spec_config.go | 2 +- .../model_traceability_agent_spec_logging.go | 16 +++++++++++ .../model_traceability_agent_status.go | 2 +- .../model_virtual_api_release_spec.go | 2 +- .../v1alpha1/model_virtual_api_spec.go | 2 +- .../v1alpha1/model_virtual_api_status.go | 2 +- .../v1alpha1/model_virtual_host_spec.go | 2 +- .../v1alpha1/model_virtual_service_spec.go | 2 +- .../v1alpha1/model_watch_topic_spec.go | 2 +- .../model_watch_topic_spec_filters.go | 2 +- .../v1alpha1/model_watch_topic_spec_scope.go | 2 +- .../management/v1alpha1/model_webhook_spec.go | 4 +-- .../v1alpha1/model_webhook_spec_auth.go | 2 +- .../model_webhook_spec_auth_secret.go | 2 +- 308 files changed, 619 insertions(+), 356 deletions(-) create mode 100644 pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner_organization.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go create mode 100644 pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go create mode 100644 pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go create mode 100644 pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go diff --git a/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go index f9482cd56..92e819e9f 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_category_spec.go @@ -9,7 +9,7 @@ package catalog -// CategorySpec struct for CategorySpec +// CategorySpec (catalog.v1.Category) type CategorySpec struct { // Markdown representing the category description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go index 1328d58fd..336f04436 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_spec.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpec struct for DocumentSpec +// DocumentSpec (catalog.v1.Document) type DocumentSpec struct { // Document description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go b/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go index dc76a182e..381c0bc6a 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_spec_sections.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpecSections struct for DocumentSpecSections +// DocumentSpecSections (catalog.v1.Document) type DocumentSpecSections struct { // Title for the section. Title string `json:"title"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_document_status.go b/pkg/apic/apiserver/models/catalog/v1/model_document_status.go index e3ca9d297..b3b6a30b6 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_document_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_document_status.go @@ -9,7 +9,7 @@ package catalog -// DocumentStatus struct for DocumentStatus +// DocumentStatus (catalog.v1.Document) type DocumentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go index e001632b3..5d8b8ec06 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_marketplace_spec.go @@ -9,7 +9,7 @@ package catalog -// MarketplaceSpec struct for MarketplaceSpec +// MarketplaceSpec (catalog.v1.Marketplace) type MarketplaceSpec struct { // description of the Marketplace. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go index b39e2c608..1c5041690 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpec struct for ProductOverviewSpec +// ProductOverviewSpec (catalog.v1.ProductOverview) type ProductOverviewSpec struct { // Defines all the documents and order for marketplace. Documents []ProductOverviewSpecDocuments `json:"documents,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go index 3b1abe808..33486d386 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_overview_spec_documents.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpecDocuments struct for ProductOverviewSpecDocuments +// ProductOverviewSpecDocuments (catalog.v1.ProductOverview) type ProductOverviewSpecDocuments struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references.go index 69d5c933e..74825be08 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references.go @@ -9,7 +9,7 @@ package catalog -// ProductReferences struct for ProductReferences +// ProductReferences (catalog.v1.Product) type ProductReferences struct { // Computed latest AssetReleases for each Asset reference in the Product. Assets []ProductReferencesAssets `json:"assets,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go index cfc2bb3c8..ea8c765c2 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesAssets struct for ProductReferencesAssets +// ProductReferencesAssets (catalog.v1.Product) type ProductReferencesAssets struct { // The Asset reference. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go index bf0e1e94a..53e89259e 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesRelease struct for ProductReferencesRelease +// ProductReferencesRelease (catalog.v1.Product) type ProductReferencesRelease struct { // The latest AssetRelease computed based on the provided Asset filters. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go index abd7fdebe..d29f639d0 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpec struct for ProductReleaseSpec +// ProductReleaseSpec (catalog.v1.ProductRelease) type ProductReleaseSpec struct { // Description of the release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go index a51f0ef6a..661ad7f5b 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecAssets struct for ProductReleaseSpecAssets +// ProductReleaseSpecAssets (catalog.v1.ProductRelease) type ProductReleaseSpecAssets struct { // The Asset name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go index 510c432c0..d7d6f9f9a 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_spec_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecRelease struct for ProductReleaseSpecRelease +// ProductReleaseSpecRelease (catalog.v1.ProductRelease) type ProductReleaseSpecRelease struct { Name string `json:"name,omitempty"` // The AssetRelease version. diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go index d8232a485..1fc463896 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseStatus struct for ProductReleaseStatus +// ProductReleaseStatus (catalog.v1.ProductRelease) type ProductReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go index ae74d3554..ebe424a75 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_error.go @@ -22,6 +22,6 @@ type ProductReleaseStatusError struct { // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go index 4fdfbd19b..88abde487 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending.go @@ -22,6 +22,6 @@ type ProductReleaseStatusPending struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // Reason for being in Pending. - Detail string `json:"detail"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go new file mode 100644 index 000000000..a266aa28b --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_pending_meta.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// ProductReleaseStatusPendingMeta struct for ProductReleaseStatusPendingMeta +type ProductReleaseStatusPendingMeta struct { + Asset string `json:"asset,omitempty"` + AssetRelease string `json:"assetRelease,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go index cc3fa3cca..7b9c12a6a 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_release_status_success.go @@ -22,6 +22,6 @@ type ProductReleaseStatusSuccess struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // message of the result - Detail string `json:"detail"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go index 8e1df7ed8..70b8aed14 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductSpec struct for ProductSpec +// ProductSpec (catalog.v1.Product) type ProductSpec struct { // description of the Product. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go index 863bd4440..141e6ce23 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAssets struct for ProductSpecAssets +// ProductSpecAssets (catalog.v1.Product) type ProductSpecAssets struct { Name string `json:"name"` Filters ProductSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go index b07c3f31b..068b6da68 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_auto_release.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. +// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. (catalog.v1.Product) type ProductSpecAutoRelease struct { ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go index 91b2c87f4..9647bf14c 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_spec_filters.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecFilters Filters what AssetRelease the Product points to. +// ProductSpecFilters Filters what AssetRelease the Product points to. (catalog.v1.Product) type ProductSpecFilters struct { // The AssetRelease version to use. Examples: - 1.0.1 for a specific asset release version - 1.* for all minor and patch versions of version 1 - 1.2.* for all the patch version for version 1.2 Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status.go index 39e077949..8a5011dd7 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status.go @@ -9,7 +9,7 @@ package catalog -// ProductStatus struct for ProductStatus +// ProductStatus (catalog.v1.Product) type ProductStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go index c1c997094..1995ca32c 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status_meta.go @@ -9,7 +9,7 @@ package catalog -// ProductStatusMeta struct for ProductStatusMeta +// ProductStatusMeta (catalog.v1.Product) type ProductStatusMeta struct { Asset string `json:"asset,omitempty"` AssetRelease string `json:"assetRelease,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go index 596b9572d..b20999f23 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_product_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ProductStatusReasons struct for ProductStatusReasons +// ProductStatusReasons (catalog.v1.Product) type ProductStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go index 275facb58..ea55d8e2c 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_spec.go @@ -9,7 +9,7 @@ package catalog -// QuotaSpec struct for QuotaSpec +// QuotaSpec (catalog.v1.Quota) type QuotaSpec struct { // description of the quota. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go b/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go index 862b00157..8717dd9d7 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_quota_status.go @@ -9,7 +9,7 @@ package catalog -// QuotaStatus struct for QuotaStatus +// QuotaStatus (catalog.v1.Quota) type QuotaStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go index 7c747ce96..474f4dfda 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// ResourceSpec struct for ResourceSpec +// ResourceSpec (catalog.v1.Resource) type ResourceSpec struct { // The type of the resource, example: pdf FileType string `json:"fileType"` diff --git a/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go b/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go index 8f3b46375..e3d2743ea 100644 --- a/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1/model_support_contact_spec.go @@ -9,7 +9,7 @@ package catalog -// SupportContactSpec struct for SupportContactSpec +// SupportContactSpec (catalog.v1.SupportContact) type SupportContactSpec struct { // Email address of the Support Contact. Email string `json:"email"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go index d957e3da2..7dab20979 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package catalog -// AccessControlListSpecRules struct for AccessControlListSpecRules +// AccessControlListSpecRules (catalog.v1alpha1.AccessControlList) type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go index 09469555e..1f73b84a1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package catalog -// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects +// AccessControlListSpecSubjects (catalog.v1alpha1.AccessControlList) type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go index 93534b524..9c02812fb 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplace Details about the marketplace Application. +// ApplicationMarketplace Details about the marketplace Application. (catalog.v1alpha1.Application) type ApplicationMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go index 601785720..6b19e85e7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResource The Marketplace Application resource details. +// ApplicationMarketplaceResource The Marketplace Application resource details. (catalog.v1alpha1.Application) type ApplicationMarketplaceResource struct { Metadata ApplicationMarketplaceResourceMetadata `json:"metadata"` Owner ApplicationMarketplaceResourceOwner `json:"owner,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go index f751e98d3..8a001ca36 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_metadata.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceMetadata Marketplace Application metadata. +// ApplicationMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Application) type ApplicationMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go index d35b48543..fb06fc6bd 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceOwner Owner of the Application. +// ApplicationMarketplaceResourceOwner Owner of the Application. (catalog.v1alpha1.Application) type ApplicationMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go index da28704e1..516b8591b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_marketplace_resource_owner_organization.go @@ -9,7 +9,7 @@ package catalog -// ApplicationMarketplaceResourceOwnerOrganization Organization details. +// ApplicationMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Application) type ApplicationMarketplaceResourceOwnerOrganization struct { // Id of the organization. Id string `json:"id"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go index d599e1813..9c9677263 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec.go @@ -9,7 +9,7 @@ package catalog -// ApplicationSpec struct for ApplicationSpec +// ApplicationSpec (catalog.v1alpha1.Application) type ApplicationSpec struct { Security ApplicationSpecSecurity `json:"security"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go index f10a3c4e7..2c058df42 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_application_spec_security.go @@ -9,7 +9,7 @@ package catalog -// ApplicationSpecSecurity struct for ApplicationSpecSecurity +// ApplicationSpecSecurity (catalog.v1alpha1.Application) type ApplicationSpecSecurity struct { // public key to be used to encrypt the credentials linked to this Application. EncryptionKey string `json:"encryptionKey"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go index 70e87e908..5e731e7b2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_access.go @@ -9,7 +9,7 @@ package catalog -// AssetAccess Defines how an asset should handle access requests received from marketplace consumers. +// AssetAccess Defines how an asset should handle access requests received from marketplace consumers. (catalog.v1alpha1.Asset) type AssetAccess struct { Approval string `json:"approval"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go index 2613b96f1..59d403883 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingSpec struct for AssetMappingSpec +// AssetMappingSpec (catalog.v1alpha1.AssetMapping) type AssetMappingSpec struct { // Reference to the executed AssetMappingTemplate. AssetMappingTemplate string `json:"assetMappingTemplate,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go index 2b6c8c2f4..b6fc7721f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_spec_inputs.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingSpecInputs The list of the inputs provided to the template. +// AssetMappingSpecInputs The list of the inputs provided to the template. (catalog.v1alpha1.AssetMapping) type AssetMappingSpecInputs struct { ApiService string `json:"apiService"` ApiServiceRevision string `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go index a8b1c1a98..a007d7509 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatus struct for AssetMappingStatus +// AssetMappingStatus (catalog.v1alpha1.AssetMapping) type AssetMappingStatus struct { Level string `json:"level,omitempty"` Source AssetMappingStatusSource `json:"source,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go index 6bd0496c6..04703b2f2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_outputs.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusOutputs struct for AssetMappingStatusOutputs +// AssetMappingStatusOutputs (catalog.v1alpha1.AssetMapping) type AssetMappingStatusOutputs struct { Resource AssetMappingStatusResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go index 923b90d94..6b8996161 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. +// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. (catalog.v1alpha1.AssetMapping) type AssetMappingStatusResource struct { AssetResource AssetMappingStatusResourceAssetResource `json:"assetResource,omitempty"` Stage AssetMappingStatusResourceStage `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go index 12a5631c0..b9499b7c9 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_asset_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResourceAssetResource struct for AssetMappingStatusResourceAssetResource +// AssetMappingStatusResourceAssetResource (catalog.v1alpha1.AssetMapping) type AssetMappingStatusResourceAssetResource struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go index 71d522cc9..f65e70600 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_resource_stage.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusResourceStage struct for AssetMappingStatusResourceStage +// AssetMappingStatusResourceStage (catalog.v1alpha1.AssetMapping) type AssetMappingStatusResourceStage struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go index bcfc74fa8..8dd93b24d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSource struct for AssetMappingStatusSource +// AssetMappingStatusSource (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSource struct { Resource AssetMappingStatusSourceResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go index 8ed5da71c..4e19eb09f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. +// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSourceResource struct { ApiService AssetMappingStatusSourceResourceApiService `json:"apiService,omitempty"` ApiServiceRevision AssetMappingStatusSourceResourceApiServiceRevision `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go index d9c40587e..17cacf60a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiService struct for AssetMappingStatusSourceResourceApiService +// AssetMappingStatusSourceResourceApiService (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiService struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go index d0963c5cc..4c47fb7df 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiServiceInstance struct for AssetMappingStatusSourceResourceApiServiceInstance +// AssetMappingStatusSourceResourceApiServiceInstance (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiServiceInstance struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go index 4b44099a7..0946c0f4c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceApiServiceRevision struct for AssetMappingStatusSourceResourceApiServiceRevision +// AssetMappingStatusSourceResourceApiServiceRevision (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiServiceRevision struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go index 18b81387c..a6564cd67 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go @@ -9,7 +9,7 @@ package catalog -// AssetMappingStatusSourceResourceAssetMappingTemplate struct for AssetMappingStatusSourceResourceAssetMappingTemplate +// AssetMappingStatusSourceResourceAssetMappingTemplate (catalog.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceAssetMappingTemplate struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go index 068947ff3..10712c9ee 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseSpec struct for AssetReleaseSpec +// AssetReleaseSpec (catalog.v1alpha1.AssetRelease) type AssetReleaseSpec struct { // Description of the asset release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go index 1dcd4b01c..656825e2d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseStatus struct for AssetReleaseStatus +// AssetReleaseStatus (catalog.v1alpha1.AssetRelease) type AssetReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go index 48b7f1072..c1806fa32 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_meta.go @@ -9,7 +9,7 @@ package catalog -// AssetReleaseStatusMeta struct for AssetReleaseStatusMeta +// AssetReleaseStatusMeta (catalog.v1alpha1.AssetRelease) type AssetReleaseStatusMeta struct { AssetResource string `json:"assetResource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go index 2b3c6ffdd..aa8c04b67 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_release_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AssetReleaseStatusReasons struct for AssetReleaseStatusReasons +// AssetReleaseStatusReasons (catalog.v1alpha1.AssetRelease) type AssetReleaseStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go index 94aa74349..b58dd1f69 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestApproval struct for AssetRequestApproval +// AssetRequestApproval (catalog.v1alpha1.AssetRequest) type AssetRequestApproval struct { State AssetRequestApprovalState `json:"state"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go index d8c2a4006..56ef1a900 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_approval_state.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestApprovalState struct for AssetRequestApprovalState +// AssetRequestApprovalState (catalog.v1alpha1.AssetRequest) type AssetRequestApprovalState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go index eec888051..e9a1d3850 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_authorization.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestDefinitionAuthorization struct for AssetRequestDefinitionAuthorization +// AssetRequestDefinitionAuthorization (catalog.v1alpha1.AssetRequestDefinition) type AssetRequestDefinitionAuthorization struct { Approval string `json:"approval"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go index 6b478f28e..7b0e0dadb 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec.go @@ -9,9 +9,9 @@ package catalog -// AssetRequestDefinitionSpec struct for AssetRequestDefinitionSpec +// AssetRequestDefinitionSpec (catalog.v1alpha1.AssetRequestDefinition) type AssetRequestDefinitionSpec struct { - // JSON Schema draft \\#7 for defining the AssetRequest properties needed to get access to an APIServiceInstance. + // JSON Schema draft \\#7 for defining the AssetRequest properties needed to get access to an APIServiceInstance. (catalog.v1alpha1.AssetRequestDefinition) Schema map[string]interface{} `json:"schema"` Provision AssetRequestDefinitionSpecProvision `json:"provision,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go index 752bb6c78..b67798afc 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_definition_spec_provision.go @@ -9,8 +9,8 @@ package catalog -// AssetRequestDefinitionSpecProvision struct for AssetRequestDefinitionSpecProvision +// AssetRequestDefinitionSpecProvision (catalog.v1alpha1.AssetRequestDefinition) type AssetRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. + // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. (catalog.v1alpha1.AssetRequestDefinition) Schema map[string]interface{} `json:"schema"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go index 5e46b2cc3..cfaf9ffa5 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestMarketplace Details about the marketplace Access Request. +// AssetRequestMarketplace Details about the marketplace Access Request. (catalog.v1alpha1.AssetRequest) type AssetRequestMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go index 31c20b5c1..76665c735 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestMarketplaceResource The Marketplace Access Request resource details. +// AssetRequestMarketplaceResource The Marketplace Access Request resource details. (catalog.v1alpha1.AssetRequest) type AssetRequestMarketplaceResource struct { Metadata AssetRequestMarketplaceResourceMetadata `json:"metadata"` Owner AssetRequestMarketplaceResourceOwner `json:"owner,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go index a28118b30..a116b5a00 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_metadata.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestMarketplaceResourceMetadata Marketplace Access Request metadata. +// AssetRequestMarketplaceResourceMetadata Marketplace Access Request metadata. (catalog.v1alpha1.AssetRequest) type AssetRequestMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go index 9e90f53c4..4ff5a5637 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner.go @@ -9,11 +9,11 @@ package catalog -// AssetRequestMarketplaceResourceOwner Owner of the Access Request. +// AssetRequestMarketplaceResourceOwner Owner of the Access Request. (catalog.v1alpha1.AssetRequest) type AssetRequestMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` // Id of the owner of the resource. - Id string `json:"id,omitempty"` - Organization ApplicationMarketplaceResourceOwnerOrganization `json:"organization"` + Id string `json:"id,omitempty"` + Organization AssetRequestMarketplaceResourceOwnerOrganization `json:"organization"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner_organization.go new file mode 100644 index 000000000..af1a0b5f0 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_marketplace_resource_owner_organization.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// AssetRequestMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.AssetRequest) +type AssetRequestMarketplaceResourceOwnerOrganization struct { + // Id of the organization. + Id string `json:"id"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go index 5e386ec36..debe8b08d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_references.go @@ -9,7 +9,7 @@ package catalog -// AssetRequestReferences struct for AssetRequestReferences +// AssetRequestReferences (catalog.v1alpha1.AssetRequest) type AssetRequestReferences struct { AssetRequestDefinition string `json:"assetRequestDefinition,omitempty"` // Reference to Release that got created from this asset request. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go index 6726ac3f4..b576cbd98 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_spec.go @@ -9,8 +9,9 @@ package catalog -// AssetRequestSpec struct for AssetRequestSpec +// AssetRequestSpec (catalog.v1alpha1.AssetRequest) type AssetRequestSpec struct { + // (catalog.v1alpha1.AssetRequest) Data map[string]interface{} `json:"data"` AssetResource string `json:"assetResource"` // reference to the Subscription to be used to access the Asset Resource. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go index 229290730..10e401bd1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status.go @@ -9,10 +9,10 @@ package catalog -// AssetRequestStatus struct for AssetRequestStatus +// AssetRequestStatus (catalog.v1alpha1.AssetRequest) type AssetRequestStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []SubscriptionStatusReasons `json:"reasons,omitempty"` + Reasons []AssetRequestStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go new file mode 100644 index 000000000..cf802a3c7 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_request_status_reasons.go @@ -0,0 +1,28 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +import ( + // GENERATE: The following code has been modified after code generation + // + // "time" + time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +// AssetRequestStatusReasons (catalog.v1alpha1.AssetRequest) +type AssetRequestStatusReasons struct { + Type string `json:"type"` + // Details of the error. + Detail string `json:"detail"` + // Time when the update occurred. + Timestamp time.Time `json:"timestamp"` + // (catalog.v1alpha1.AssetRequest) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go index 94b81f607..f102e9bdc 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_references.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceReferences struct for AssetResourceReferences +// AssetResourceReferences (catalog.v1alpha1.AssetResource) type AssetResourceReferences struct { // Reference to API Service Revision resource ApiServiceRevision string `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go index 0038e1ab6..0f88c667f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceSpec struct for AssetResourceSpec +// AssetResourceSpec (catalog.v1alpha1.AssetResource) type AssetResourceSpec struct { // The Stage this Asset Resource is deployed on. Stage string `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go index 7ba1b10e1..eb63164ec 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_resource_spec_access_info.go @@ -9,7 +9,7 @@ package catalog -// AssetResourceSpecAccessInfo struct for AssetResourceSpecAccessInfo +// AssetResourceSpecAccessInfo (catalog.v1alpha1.AssetResource) type AssetResourceSpecAccessInfo struct { // url where the definition can be accessed. Url string `json:"url,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go index bfd318be8..aa031b891 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec.go @@ -9,7 +9,7 @@ package catalog -// AssetSpec struct for AssetSpec +// AssetSpec (catalog.v1alpha1.Asset) type AssetSpec struct { // description of the asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go index 919d5c104..e2fa803dd 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_spec_auto_release.go @@ -9,7 +9,7 @@ package catalog -// AssetSpecAutoRelease Defines if an asset should create releases everytime there is an update to the resources. +// AssetSpecAutoRelease Defines if an asset should create releases everytime there is an update to the resources. (catalog.v1alpha1.Asset) type AssetSpecAutoRelease struct { ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go index 002a38b35..9a69b183a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status.go @@ -9,7 +9,7 @@ package catalog -// AssetStatus struct for AssetStatus +// AssetStatus (catalog.v1alpha1.Asset) type AssetStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go index 63785466c..499513f5d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_meta.go @@ -9,7 +9,7 @@ package catalog -// AssetStatusMeta struct for AssetStatusMeta +// AssetStatusMeta (catalog.v1alpha1.Asset) type AssetStatusMeta struct { AssetResource string `json:"assetResource,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go index cc02af012..3b6b1dfe6 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_asset_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AssetStatusReasons struct for AssetStatusReasons +// AssetStatusReasons (catalog.v1alpha1.Asset) type AssetStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go index 6f3650d47..e55014086 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_references.go @@ -9,7 +9,7 @@ package catalog -// AuthorizationProfileReferences struct for AuthorizationProfileReferences +// AuthorizationProfileReferences (catalog.v1alpha1.AuthorizationProfile) type AuthorizationProfileReferences struct { Environment string `json:"environment,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go index 5063a8b10..41d52b015 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_authorization_profile_spec.go @@ -9,7 +9,7 @@ package catalog -// AuthorizationProfileSpec struct for AuthorizationProfileSpec +// AuthorizationProfileSpec (catalog.v1alpha1.AuthorizationProfile) type AuthorizationProfileSpec struct { // Description of AuthorizationProfile that can be used to access Asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go index f9482cd56..72b45103e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_category_spec.go @@ -9,7 +9,7 @@ package catalog -// CategorySpec struct for CategorySpec +// CategorySpec (catalog.v1alpha1.Category) type CategorySpec struct { // Markdown representing the category description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go index 19e15c073..b2e07eb5c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace.go @@ -9,7 +9,7 @@ package catalog -// CredentialMarketplace Details about the marketplace Application. +// CredentialMarketplace Details about the marketplace Application. (catalog.v1alpha1.Credential) type CredentialMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go index 1b2bcf1b5..6e047edbe 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource.go @@ -9,8 +9,8 @@ package catalog -// CredentialMarketplaceResource The Marketplace Credential resource details. +// CredentialMarketplaceResource The Marketplace Credential resource details. (catalog.v1alpha1.Credential) type CredentialMarketplaceResource struct { - Metadata ApplicationMarketplaceResourceMetadata `json:"metadata"` - Owner CredentialMarketplaceResourceOwner `json:"owner,omitempty"` + Metadata CredentialMarketplaceResourceMetadata `json:"metadata"` + Owner CredentialMarketplaceResourceOwner `json:"owner,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go new file mode 100644 index 000000000..d40484f04 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_metadata.go @@ -0,0 +1,18 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// CredentialMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Credential) +type CredentialMarketplaceResourceMetadata struct { + // Id of the user that created the entity. + CreateUserId string `json:"createUserId,omitempty"` + // Id of the user that created the entity. + ModifyUserId string `json:"modifyUserId,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go index ec2c3a98c..cbe69ef66 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner.go @@ -9,11 +9,11 @@ package catalog -// CredentialMarketplaceResourceOwner Owner of the Credential. +// CredentialMarketplaceResourceOwner Owner of the Credential. (catalog.v1alpha1.Credential) type CredentialMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` // Id of the owner of the resource. - Id string `json:"id,omitempty"` - Organization ApplicationMarketplaceResourceOwnerOrganization `json:"organization"` + Id string `json:"id,omitempty"` + Organization CredentialMarketplaceResourceOwnerOrganization `json:"organization"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go new file mode 100644 index 000000000..563e3aec9 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_marketplace_resource_owner_organization.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// CredentialMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Credential) +type CredentialMarketplaceResourceOwnerOrganization struct { + // Id of the organization. + Id string `json:"id"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go index 8d45d48c9..6f68497f2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies.go @@ -9,7 +9,7 @@ package catalog -// CredentialPolicies struct for CredentialPolicies +// CredentialPolicies (catalog.v1alpha1.Credential) type CredentialPolicies struct { Expiry CredentialPoliciesExpiry `json:"expiry,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go index c3d590bb7..165893009 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_policies_expiry.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialPoliciesExpiry struct for CredentialPoliciesExpiry +// CredentialPoliciesExpiry (catalog.v1alpha1.Credential) type CredentialPoliciesExpiry struct { // Time when the Credential is set to be expired. Timestamp time.Time `json:"timestamp"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go index 43ddd661b..9b654f289 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_references.go @@ -9,7 +9,7 @@ package catalog -// CredentialReferences struct for CredentialReferences +// CredentialReferences (catalog.v1alpha1.Credential) type CredentialReferences struct { // Reference to the Credential for managed app that got created from this catalog credential. Credential string `json:"credential,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go index cef5f937f..ff78127ca 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_references.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionReferences struct for CredentialRequestDefinitionReferences +// CredentialRequestDefinitionReferences (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionReferences struct { // The name of the CredentialRequestDefinition from an Environment. CredentialReqDef string `json:"credentialReqDef,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go index 8d35b84ae..02b3b8853 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec.go @@ -9,9 +9,9 @@ package catalog -// CredentialRequestDefinitionSpec struct for CredentialRequestDefinitionSpec +// CredentialRequestDefinitionSpec (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpec struct { - // JSON Schema draft \\#7 for describing the fields needed to provision Credentials of that type. + // JSON Schema draft \\#7 for describing the fields needed to provision Credentials of that type. (catalog.v1alpha1.CredentialRequestDefinition) Schema map[string]interface{} `json:"schema"` Provision CredentialRequestDefinitionSpecProvision `json:"provision"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go index 5014da807..419817656 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision.go @@ -9,9 +9,9 @@ package catalog -// CredentialRequestDefinitionSpecProvision struct for CredentialRequestDefinitionSpecProvision +// CredentialRequestDefinitionSpecProvision (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the generated credentials format. + // JSON Schema draft \\#7 for describing the generated credentials format. (catalog.v1alpha1.CredentialRequestDefinition) Schema map[string]interface{} `json:"schema"` Policies CredentialRequestDefinitionSpecProvisionPolicies `json:"policies,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go index 1a9001008..e34cac0b0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPolicies Defines the policies applied on the Credentials generated using this definition. +// CredentialRequestDefinitionSpecProvisionPolicies Defines the policies applied on the Credentials generated using this definition. (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvisionPolicies struct { // Defines on if Credentials using this definitions can be renewed. Renewable bool `json:"renewable,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go index a016f598f..e5d079ac3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. +// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvisionPoliciesExpiry struct { // The number of days after the Credentials are considered to be expired. Period int32 `json:"period"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go index 88c524037..14cdde9cd 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go @@ -9,7 +9,7 @@ package catalog -// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct for CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions +// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions (catalog.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct { // The type of the action taken when the Credential using this definition expires. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go index 111b8634c..376c1f473 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec.go @@ -9,11 +9,11 @@ package catalog -// CredentialSpec struct for CredentialSpec +// CredentialSpec (catalog.v1alpha1.Credential) type CredentialSpec struct { // Reference to Credential Request Definition resource CredentialRequestDefinition string `json:"credentialRequestDefinition"` - // data matching the credential request definition schema. + // data matching the credential request definition schema. (catalog.v1alpha1.Credential) Data map[string]interface{} `json:"data"` State CredentialSpecState `json:"state,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go index d8d162c7a..178506682 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_spec_state.go @@ -9,7 +9,7 @@ package catalog -// CredentialSpecState Desired state of the Credential. +// CredentialSpecState Desired state of the Credential. (catalog.v1alpha1.Credential) type CredentialSpecState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go index ce422236e..824ce0e2a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_state.go @@ -9,7 +9,7 @@ package catalog -// CredentialState Current state of the Credential. +// CredentialState Current state of the Credential. (catalog.v1alpha1.Credential) type CredentialState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go index 3a4bfa84c..c82ece980 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status.go @@ -9,7 +9,7 @@ package catalog -// CredentialStatus struct for CredentialStatus +// CredentialStatus (catalog.v1alpha1.Credential) type CredentialStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go index 75bdaf604..03b9859ae 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_credential_status_reasons.go @@ -16,13 +16,14 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialStatusReasons struct for CredentialStatusReasons +// CredentialStatusReasons (catalog.v1alpha1.Credential) type CredentialStatusReasons struct { // type of the reason. Type string `json:"type"` // Details of the type. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + // (catalog.v1alpha1.Credential) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go index 1328d58fd..740a11703 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpec struct for DocumentSpec +// DocumentSpec (catalog.v1alpha1.Document) type DocumentSpec struct { // Document description. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go index dc76a182e..965960053 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_spec_sections.go @@ -9,7 +9,7 @@ package catalog -// DocumentSpecSections struct for DocumentSpecSections +// DocumentSpecSections (catalog.v1alpha1.Document) type DocumentSpecSections struct { // Title for the section. Title string `json:"title"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go index e3ca9d297..85b38267f 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_document_status.go @@ -9,7 +9,7 @@ package catalog -// DocumentStatus struct for DocumentStatus +// DocumentStatus (catalog.v1alpha1.Document) type DocumentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go index e001632b3..c24bd20d2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_marketplace_spec.go @@ -9,7 +9,7 @@ package catalog -// MarketplaceSpec struct for MarketplaceSpec +// MarketplaceSpec (catalog.v1alpha1.Marketplace) type MarketplaceSpec struct { // description of the Marketplace. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go index b39e2c608..02abd6bd5 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpec struct for ProductOverviewSpec +// ProductOverviewSpec (catalog.v1alpha1.ProductOverview) type ProductOverviewSpec struct { // Defines all the documents and order for marketplace. Documents []ProductOverviewSpecDocuments `json:"documents,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go index 3b1abe808..1fcd645e1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_overview_spec_documents.go @@ -9,7 +9,7 @@ package catalog -// ProductOverviewSpecDocuments struct for ProductOverviewSpecDocuments +// ProductOverviewSpecDocuments (catalog.v1alpha1.ProductOverview) type ProductOverviewSpecDocuments struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go index cb8796183..90fbcb6f2 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanReferences struct for ProductPlanReferences +// ProductPlanReferences (catalog.v1alpha1.ProductPlan) type ProductPlanReferences struct { Product ProductPlanReferencesProduct `json:"product,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go index aa39f6c0b..d683d8cdf 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_references_product.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanReferencesProduct struct for ProductPlanReferencesProduct +// ProductPlanReferencesProduct (catalog.v1alpha1.ProductPlan) type ProductPlanReferencesProduct struct { // The latest active Product Release that corresponds to the Product referenced in the Plan. Release string `json:"release,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go index 193413ab9..347d03f56 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpec struct for ProductPlanSpec +// ProductPlanSpec (catalog.v1alpha1.ProductPlan) type ProductPlanSpec struct { Product string `json:"product"` // description of the Plan. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go index 43ff2945b..a42deb9b3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_billing.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecBilling Paid plan billing details. +// ProductPlanSpecBilling Paid plan billing details. (catalog.v1alpha1.ProductPlan) type ProductPlanSpecBilling struct { Currency string `json:"currency"` // The base price for the plan. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go index d5149ec33..4b326fc9c 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_features.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecFeatures struct for ProductPlanSpecFeatures +// ProductPlanSpecFeatures (catalog.v1alpha1.ProductPlan) type ProductPlanSpecFeatures struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go index 76ed7d216..35cc8d634 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecSubscription Defines Plan's subscription information +// ProductPlanSpecSubscription Defines Plan's subscription information (catalog.v1alpha1.ProductPlan) type ProductPlanSpecSubscription struct { Interval ProductPlanSpecSubscriptionInterval `json:"interval,omitempty"` Renewal string `json:"renewal,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go index 1ce5a94ee..f7fff5517 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_spec_subscription_interval.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanSpecSubscriptionInterval The subscription interval +// ProductPlanSpecSubscriptionInterval The subscription interval (catalog.v1alpha1.ProductPlan) type ProductPlanSpecSubscriptionInterval struct { // The type of the interval Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go index d7cf3cb10..fc278ab0d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status.go @@ -9,10 +9,10 @@ package catalog -// ProductPlanStatus struct for ProductPlanStatus +// ProductPlanStatus (catalog.v1alpha1.ProductPlan) type ProductPlanStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []SubscriptionStatusReasons `json:"reasons,omitempty"` + Reasons []ProductPlanStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go new file mode 100644 index 000000000..5ee793237 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_status_reasons.go @@ -0,0 +1,28 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +import ( + // GENERATE: The following code has been modified after code generation + // + // "time" + time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +// ProductPlanStatusReasons (catalog.v1alpha1.ProductPlan) +type ProductPlanStatusReasons struct { + Type string `json:"type"` + // Details of the error. + Detail string `json:"detail"` + // Time when the update occurred. + Timestamp time.Time `json:"timestamp"` + // (catalog.v1alpha1.ProductPlan) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go index aa02d1e8c..378d68359 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_plan_unit_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductPlanUnitSpec struct for ProductPlanUnitSpec +// ProductPlanUnitSpec (catalog.v1alpha1.ProductPlanUnit) type ProductPlanUnitSpec struct { // description of the Plan. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go index 69d5c933e..6528d466a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references.go @@ -9,7 +9,7 @@ package catalog -// ProductReferences struct for ProductReferences +// ProductReferences (catalog.v1alpha1.Product) type ProductReferences struct { // Computed latest AssetReleases for each Asset reference in the Product. Assets []ProductReferencesAssets `json:"assets,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go index cfc2bb3c8..6f5ecba64 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesAssets struct for ProductReferencesAssets +// ProductReferencesAssets (catalog.v1alpha1.Product) type ProductReferencesAssets struct { // The Asset reference. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go index bf0e1e94a..df38258f8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReferencesRelease struct for ProductReferencesRelease +// ProductReferencesRelease (catalog.v1alpha1.Product) type ProductReferencesRelease struct { // The latest AssetRelease computed based on the provided Asset filters. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go index abd7fdebe..c09b610d4 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpec struct for ProductReleaseSpec +// ProductReleaseSpec (catalog.v1alpha1.ProductRelease) type ProductReleaseSpec struct { // Description of the release. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go index a51f0ef6a..c7c5ef573 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecAssets struct for ProductReleaseSpecAssets +// ProductReleaseSpecAssets (catalog.v1alpha1.ProductRelease) type ProductReleaseSpecAssets struct { // The Asset name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go index 510c432c0..fb160fad0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_spec_release.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseSpecRelease struct for ProductReleaseSpecRelease +// ProductReleaseSpecRelease (catalog.v1alpha1.ProductRelease) type ProductReleaseSpecRelease struct { Name string `json:"name,omitempty"` // The AssetRelease version. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go index d8232a485..3b16eced1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status.go @@ -9,7 +9,7 @@ package catalog -// ProductReleaseStatus struct for ProductReleaseStatus +// ProductReleaseStatus (catalog.v1alpha1.ProductRelease) type ProductReleaseStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go index ae74d3554..ebe424a75 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_error.go @@ -22,6 +22,6 @@ type ProductReleaseStatusError struct { // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go index 4fdfbd19b..88abde487 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending.go @@ -22,6 +22,6 @@ type ProductReleaseStatusPending struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // Reason for being in Pending. - Detail string `json:"detail"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go new file mode 100644 index 000000000..a266aa28b --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_pending_meta.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// ProductReleaseStatusPendingMeta struct for ProductReleaseStatusPendingMeta +type ProductReleaseStatusPendingMeta struct { + Asset string `json:"asset,omitempty"` + AssetRelease string `json:"assetRelease,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go index cc3fa3cca..7b9c12a6a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_release_status_success.go @@ -22,6 +22,6 @@ type ProductReleaseStatusSuccess struct { // Time when the change occured. Timestamp time.Time `json:"timestamp"` // message of the result - Detail string `json:"detail"` - Meta ProductStatusMeta `json:"meta,omitempty"` + Detail string `json:"detail"` + Meta ProductReleaseStatusPendingMeta `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go index 8e1df7ed8..c177e5e55 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductSpec struct for ProductSpec +// ProductSpec (catalog.v1alpha1.Product) type ProductSpec struct { // description of the Product. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go index 863bd4440..b793520a3 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_assets.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAssets struct for ProductSpecAssets +// ProductSpecAssets (catalog.v1alpha1.Product) type ProductSpecAssets struct { Name string `json:"name"` Filters ProductSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go index b07c3f31b..81705e231 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_auto_release.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. +// ProductSpecAutoRelease Defines if a product should create releases everytime there is an update to the product references. (catalog.v1alpha1.Product) type ProductSpecAutoRelease struct { ReleaseType string `json:"releaseType"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go index 91b2c87f4..820904d35 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_spec_filters.go @@ -9,7 +9,7 @@ package catalog -// ProductSpecFilters Filters what AssetRelease the Product points to. +// ProductSpecFilters Filters what AssetRelease the Product points to. (catalog.v1alpha1.Product) type ProductSpecFilters struct { // The AssetRelease version to use. Examples: - 1.0.1 for a specific asset release version - 1.* for all minor and patch versions of version 1 - 1.2.* for all the patch version for version 1.2 Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go index 39e077949..0c4ef8f9a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status.go @@ -9,7 +9,7 @@ package catalog -// ProductStatus struct for ProductStatus +// ProductStatus (catalog.v1alpha1.Product) type ProductStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go index c1c997094..7b4cc7ea0 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_meta.go @@ -9,7 +9,7 @@ package catalog -// ProductStatusMeta struct for ProductStatusMeta +// ProductStatusMeta (catalog.v1alpha1.Product) type ProductStatusMeta struct { Asset string `json:"asset,omitempty"` AssetRelease string `json:"assetRelease,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go index 596b9572d..4e692ef2d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_status_reasons.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ProductStatusReasons struct for ProductStatusReasons +// ProductStatusReasons (catalog.v1alpha1.Product) type ProductStatusReasons struct { Type string `json:"type"` // Details of the error. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go index c67fd69fb..f4fde840e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec.go @@ -9,7 +9,7 @@ package catalog -// ProductVisibilitySpec struct for ProductVisibilitySpec +// ProductVisibilitySpec (catalog.v1alpha1.ProductVisibility) type ProductVisibilitySpec struct { // Defines where the visibility settings apply. Products []ProductVisibilitySpecProducts `json:"products"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go index 86695be20..e21f8e525 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_product_visibility_spec_products.go @@ -9,7 +9,7 @@ package catalog -// ProductVisibilitySpecProducts struct for ProductVisibilitySpecProducts +// ProductVisibilitySpecProducts (catalog.v1alpha1.ProductVisibility) type ProductVisibilitySpecProducts struct { Name string `json:"name"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go index 622759a2b..035a63b43 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductReferences struct for PublishedProductReferences +// PublishedProductReferences (catalog.v1alpha1.PublishedProduct) type PublishedProductReferences struct { Release PublishedProductReferencesRelease `json:"release"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go index 6f68c1324..6005fe445 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_references_release.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductReferencesRelease The Product release that was published to the marketplace +// PublishedProductReferencesRelease The Product release that was published to the marketplace (catalog.v1alpha1.PublishedProduct) type PublishedProductReferencesRelease struct { // Reference to product release Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go index 30eb9d35a..38a705f1e 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductSpec struct for PublishedProductSpec +// PublishedProductSpec (catalog.v1alpha1.PublishedProduct) type PublishedProductSpec struct { Product PublishedProductSpecProduct `json:"product,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go index 1e0d904ac..ff5112b19 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_published_product_spec_product.go @@ -9,7 +9,7 @@ package catalog -// PublishedProductSpecProduct struct for PublishedProductSpecProduct +// PublishedProductSpecProduct (catalog.v1alpha1.PublishedProduct) type PublishedProductSpecProduct struct { Name string `json:"name,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go index 275facb58..abf5d78dc 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_spec.go @@ -9,7 +9,7 @@ package catalog -// QuotaSpec struct for QuotaSpec +// QuotaSpec (catalog.v1alpha1.Quota) type QuotaSpec struct { // description of the quota. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go index 862b00157..dc45db4d1 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_quota_status.go @@ -9,7 +9,7 @@ package catalog -// QuotaStatus struct for QuotaStatus +// QuotaStatus (catalog.v1alpha1.Quota) type QuotaStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go index 3242eb5f1..d6817c936 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_spec.go @@ -9,7 +9,7 @@ package catalog -// ReleaseTagSpec struct for ReleaseTagSpec +// ReleaseTagSpec (catalog.v1alpha1.ReleaseTag) type ReleaseTagSpec struct { // Description of the Release Tag. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go index afe58703c..24161fd2d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_release_tag_status.go @@ -9,7 +9,7 @@ package catalog -// ReleaseTagStatus struct for ReleaseTagStatus +// ReleaseTagStatus (catalog.v1alpha1.ReleaseTag) type ReleaseTagStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go index 7c747ce96..f69ef9e60 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_resource_spec.go @@ -9,7 +9,7 @@ package catalog -// ResourceSpec struct for ResourceSpec +// ResourceSpec (catalog.v1alpha1.Resource) type ResourceSpec struct { // The type of the resource, example: pdf FileType string `json:"fileType"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go index 515729652..0ae34f7c8 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_secret_spec.go @@ -9,8 +9,8 @@ package catalog -// SecretSpec struct for SecretSpec +// SecretSpec (catalog.v1alpha1.Secret) type SecretSpec struct { - // Key value pairs. The value will be stored encrypted. + // Key value pairs. The value will be stored encrypted. (catalog.v1alpha1.Secret) Data map[string]string `json:"data,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go index 23911ca00..643b6aff5 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_stage_spec.go @@ -9,7 +9,7 @@ package catalog -// StageSpec struct for StageSpec +// StageSpec (catalog.v1alpha1.Stage) type StageSpec struct { // description of the stage Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go index df761436f..c23e4c330 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_approval.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionApproval struct for SubscriptionApproval +// SubscriptionApproval (catalog.v1alpha1.Subscription) type SubscriptionApproval struct { State string `json:"state"` // Reason for the state. diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go index 6bb1701bb..9b6bd341d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace.go @@ -9,9 +9,9 @@ package catalog -// SubscriptionMarketplace Details about the marketplace Application. +// SubscriptionMarketplace Details about the marketplace Application. (catalog.v1alpha1.Subscription) type SubscriptionMarketplace struct { // The name of the Marketplace. - Name string `json:"name"` - Resource ApplicationMarketplaceResource `json:"resource"` + Name string `json:"name"` + Resource SubscriptionMarketplaceResource `json:"resource"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go new file mode 100644 index 000000000..d4b91d117 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SubscriptionMarketplaceResource The Marketplace Application resource details. (catalog.v1alpha1.Subscription) +type SubscriptionMarketplaceResource struct { + Metadata SubscriptionMarketplaceResourceMetadata `json:"metadata"` + Owner SubscriptionMarketplaceResourceOwner `json:"owner,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go new file mode 100644 index 000000000..65ac58dde --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_metadata.go @@ -0,0 +1,18 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SubscriptionMarketplaceResourceMetadata Marketplace Application metadata. (catalog.v1alpha1.Subscription) +type SubscriptionMarketplaceResourceMetadata struct { + // Id of the user that created the entity. + CreateUserId string `json:"createUserId,omitempty"` + // Id of the user that created the entity. + ModifyUserId string `json:"modifyUserId,omitempty"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go new file mode 100644 index 000000000..a165aef62 --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner.go @@ -0,0 +1,19 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SubscriptionMarketplaceResourceOwner Owner of the Application. (catalog.v1alpha1.Subscription) +type SubscriptionMarketplaceResourceOwner struct { + // The type of the owner. + Type string `json:"type,omitempty"` + // Id of the owner of the resource. + Id string `json:"id,omitempty"` + Organization SubscriptionMarketplaceResourceOwnerOrganization `json:"organization"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go new file mode 100644 index 000000000..734ee4b1b --- /dev/null +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_marketplace_resource_owner_organization.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package catalog + +// SubscriptionMarketplaceResourceOwnerOrganization Organization details. (catalog.v1alpha1.Subscription) +type SubscriptionMarketplaceResourceOwnerOrganization struct { + // Id of the organization. + Id string `json:"id"` +} diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go index 263cae6b9..bc94568b6 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionSpec struct for SubscriptionSpec +// SubscriptionSpec (catalog.v1alpha1.Subscription) type SubscriptionSpec struct { // Reference to Product resource Product string `json:"product"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go index 0c05bccb7..638f17c01 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_spec_plan.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionSpecPlan struct for SubscriptionSpecPlan +// SubscriptionSpecPlan (catalog.v1alpha1.Subscription) type SubscriptionSpecPlan struct { // Reference to Product resource Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go index 22f9a1722..84c88825d 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status.go @@ -9,7 +9,7 @@ package catalog -// SubscriptionStatus struct for SubscriptionStatus +// SubscriptionStatus (catalog.v1alpha1.Subscription) type SubscriptionStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go index fe0bb7532..95864e69b 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_subscription_status_reasons.go @@ -16,12 +16,13 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// SubscriptionStatusReasons struct for SubscriptionStatusReasons +// SubscriptionStatusReasons (catalog.v1alpha1.Subscription) type SubscriptionStatusReasons struct { Type string `json:"type"` // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + // (catalog.v1alpha1.Subscription) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go index 8f3b46375..77f80ef7a 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_support_contact_spec.go @@ -9,7 +9,7 @@ package catalog -// SupportContactSpec struct for SupportContactSpec +// SupportContactSpec (catalog.v1alpha1.SupportContact) type SupportContactSpec struct { // Email address of the Support Contact. Email string `json:"email"` diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go index 7f79f2591..8700da1a7 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec.go @@ -9,11 +9,11 @@ package catalog -// WebhookSpec struct for WebhookSpec +// WebhookSpec (catalog.v1alpha1.Webhook) type WebhookSpec struct { Auth WebhookSpecAuth `json:"auth,omitempty"` Enabled bool `json:"enabled,omitempty"` Url string `json:"url"` - // A list of headers that will be sent as par of the http call to the webhook endpoint. + // A list of headers that will be sent as par of the http call to the webhook endpoint. (catalog.v1alpha1.Webhook) Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go index e4b959210..c5e1e0022 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth.go @@ -9,7 +9,7 @@ package catalog -// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. +// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. (catalog.v1alpha1.Webhook) type WebhookSpecAuth struct { Secret WebhookSpecAuthSecret `json:"secret,omitempty"` } diff --git a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go index f1373f0a4..14e937d15 100644 --- a/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go +++ b/pkg/apic/apiserver/models/catalog/v1alpha1/model_webhook_spec_auth_secret.go @@ -9,7 +9,7 @@ package catalog -// WebhookSpecAuthSecret struct for WebhookSpecAuthSecret +// WebhookSpecAuthSecret (catalog.v1alpha1.Webhook) type WebhookSpecAuthSecret struct { // Secret name to be used as a reference. If the secret is removed, the reference gets removed and the webhook invocation will be done with no Authorization header. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go index 7c14f0df4..224b74f20 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package definitions -// AccessControlListSpecRules struct for AccessControlListSpecRules +// AccessControlListSpecRules (definitions.v1alpha1.AccessControlList) type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go index 077a525d5..92cd34640 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package definitions -// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects +// AccessControlListSpecSubjects (definitions.v1alpha1.AccessControlList) type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go index 366ee3cb7..e209cd422 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpec struct for CommandLineInterfaceSpec +// CommandLineInterfaceSpec (definitions.v1alpha1.CommandLineInterface) type CommandLineInterfaceSpec struct { // A reference to a resource definition. ResourceDefinition string `json:"resourceDefinition"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go index 081a69eb2..a9c196435 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_columns.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpecColumns struct for CommandLineInterfaceSpecColumns +// CommandLineInterfaceSpecColumns (definitions.v1alpha1.CommandLineInterface) type CommandLineInterfaceSpecColumns struct { // The name of the column for the resource. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go index 88bc9fce7..904b1f828 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_command_line_interface_spec_names.go @@ -9,7 +9,7 @@ package definitions -// CommandLineInterfaceSpecNames struct for CommandLineInterfaceSpecNames +// CommandLineInterfaceSpecNames (definitions.v1alpha1.CommandLineInterface) type CommandLineInterfaceSpecNames struct { // Defines the name used to access resources in this group. Also provided as default in the autocomplete for listing commands. Plural string `json:"plural"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go index 53c3d1bd1..0cafe5ef4 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpec struct for ResourceDefinitionSpec +// ResourceDefinitionSpec (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpec struct { // Value used in the endpoint path for accessing the resource. Plural string `json:"plural"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go index d712de7c5..851db8538 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferences struct for ResourceDefinitionSpecReferences +// ResourceDefinitionSpecReferences (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecReferences struct { // A list of resources that the current resources has references to. ToResources []ResourceDefinitionSpecReferencesToResources `json:"toResources,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go index 103391945..e3b6f8f7e 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFrom struct for ResourceDefinitionSpecReferencesFrom +// ResourceDefinitionSpecReferencesFrom (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecReferencesFrom struct { // Defines the subResource which is referring to the resource. Omit for non subResource references. SubResourceName string `json:"subResourceName,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go index 461f7927b..f5234680f 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_1.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFrom1 struct for ResourceDefinitionSpecReferencesFrom1 +// ResourceDefinitionSpecReferencesFrom1 (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecReferencesFrom1 struct { // Defines the subResource referencing this resource. Omit for non subResource references. SubResourceName string `json:"subResourceName,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go index 2d255dcd3..669aaf867 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_from_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesFromResources struct for ResourceDefinitionSpecReferencesFromResources +// ResourceDefinitionSpecReferencesFromResources (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecReferencesFromResources struct { // Defines the kind of the resource. Group string `json:"group,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go index 9be6ca6b7..b9479df89 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_references_to_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecReferencesToResources struct for ResourceDefinitionSpecReferencesToResources +// ResourceDefinitionSpecReferencesToResources (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecReferencesToResources struct { // Defines the kind of the resource. Group string `json:"group,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go index 517b5c337..1b6464038 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_scope.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecScope struct for ResourceDefinitionSpecScope +// ResourceDefinitionSpecScope (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecScope struct { // Defines the kind of the scope. The server infers this from the endpoint the client submits the request to. Kind string `json:"kind,omitempty"` diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go index ca761e91d..f602599ba 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_spec_sub_resources.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionSpecSubResources Describes the subresources that the current resource might have. +// ResourceDefinitionSpecSubResources Describes the subresources that the current resource might have. (definitions.v1alpha1.ResourceDefinition) type ResourceDefinitionSpecSubResources struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go index 7fcecff30..6c0aa7812 100644 --- a/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go +++ b/pkg/apic/apiserver/models/definitions/v1alpha1/model_resource_definition_version_spec.go @@ -9,7 +9,7 @@ package definitions -// ResourceDefinitionVersionSpec struct for ResourceDefinitionVersionSpec +// ResourceDefinitionVersionSpec (definitions.v1alpha1.ResourceDefinitionVersion) type ResourceDefinitionVersionSpec struct { // A reference to a resource definition. ResourceDefinition string `json:"resourceDefinition"` @@ -19,6 +19,6 @@ type ResourceDefinitionVersionSpec struct { Served bool `json:"served"` // Defines if this version is used when storing the resource instance details. Storage bool `json:"storage"` - // Defines the strucure of the spec for this resource version. + // Defines the strucure of the spec for this resource version. (definitions.v1alpha1.ResourceDefinitionVersion) Spec map[string]interface{} `json:"spec,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go index 4d652ecd4..60fc36fbb 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_rules.go @@ -9,7 +9,7 @@ package management -// AccessControlListSpecRules struct for AccessControlListSpecRules +// AccessControlListSpecRules (management.v1alpha1.AccessControlList) type AccessControlListSpecRules struct { // GENERATE: The following code has been modified after code generation Access []interface{} `json:"access,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go index 127fab72a..3f7682d0a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_control_list_spec_subjects.go @@ -9,7 +9,7 @@ package management -// AccessControlListSpecSubjects struct for AccessControlListSpecSubjects +// AccessControlListSpecSubjects (management.v1alpha1.AccessControlList) type AccessControlListSpecSubjects struct { // Type of the subject Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go index c54bf5a74..cd5afe9b8 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_definition_spec_provision.go @@ -9,8 +9,8 @@ package management -// AccessRequestDefinitionSpecProvision struct for AccessRequestDefinitionSpecProvision +// AccessRequestDefinitionSpecProvision (management.v1alpha1.AccessRequestDefinition) type AccessRequestDefinitionSpecProvision struct { - // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. + // JSON Schema draft \\#7 for describing the data to be sent back after access has been provisioned. (management.v1alpha1.AccessRequestDefinition) Schema map[string]interface{} `json:"schema"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go index 6bb73f018..0d5e6f2d1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_spec_quota.go @@ -9,7 +9,7 @@ package management -// AccessRequestSpecQuota Quota information for accessing the api. +// AccessRequestSpecQuota Quota information for accessing the api. (management.v1alpha1.AccessRequest) type AccessRequestSpecQuota struct { // The limit of the allowed quota for the access request. // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go index 58ba1d8de..9b1ec126a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status.go @@ -9,7 +9,7 @@ package management -// AccessRequestStatus struct for AccessRequestStatus +// AccessRequestStatus (management.v1alpha1.AccessRequest) type AccessRequestStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go index 069864504..3d9d4d3bc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_access_request_status_reasons.go @@ -16,12 +16,13 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// AccessRequestStatusReasons struct for AccessRequestStatusReasons +// AccessRequestStatusReasons (management.v1alpha1.AccessRequest) type AccessRequestStatusReasons struct { Type string `json:"type"` // Details of the error. Detail string `json:"detail"` // Time when the update occurred. - Timestamp time.Time `json:"timestamp"` - Meta map[string]map[string]interface{} `json:"meta,omitempty"` + Timestamp time.Time `json:"timestamp"` + // (management.v1alpha1.AccessRequest) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go index d15dceb02..a268b211e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyConfigSpec struct for AmplifyConfigSpec +// AmplifyConfigSpec (management.v1alpha1.AmplifyConfig) type AmplifyConfigSpec struct { Address AmplifyConfigSpecAddress `json:"address"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go index 8be7451e4..7ff05dbf7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_config_spec_address.go @@ -9,7 +9,7 @@ package management -// AmplifyConfigSpecAddress The listener address configuration. +// AmplifyConfigSpecAddress The listener address configuration. (management.v1alpha1.AmplifyConfig) type AmplifyConfigSpecAddress struct { // The listener interface Interface string `json:"interface"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go index 277de89f0..a99cbc24b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyJwtAuthRuleSpec struct for AmplifyJwtAuthRuleSpec +// AmplifyJwtAuthRuleSpec (management.v1alpha1.AmplifyJWTAuthRule) type AmplifyJwtAuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go index cb253790b..cf4ebce32 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_from.go @@ -9,7 +9,7 @@ package management -// AmplifyJwtAuthRuleSpecFrom struct for AmplifyJwtAuthRuleSpecFrom +// AmplifyJwtAuthRuleSpecFrom (management.v1alpha1.AmplifyJWTAuthRule) type AmplifyJwtAuthRuleSpecFrom struct { // Where to look for the token. In string `json:"in"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go index 17a6f5eb6..e55ddda2a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_jwt_auth_rule_spec_jwks.go @@ -9,7 +9,7 @@ package management -// AmplifyJwtAuthRuleSpecJwks struct for AmplifyJwtAuthRuleSpecJwks +// AmplifyJwtAuthRuleSpecJwks (management.v1alpha1.AmplifyJWTAuthRule) type AmplifyJwtAuthRuleSpecJwks struct { // The URI from which to fetch the JSON Web Key Set(JWKS). Uri string `json:"uri"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go index 64c33c69d..36cde679a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_o_auth2_auth_rule_spec.go @@ -9,7 +9,7 @@ package management -// AmplifyOAuth2AuthRuleSpec struct for AmplifyOAuth2AuthRuleSpec +// AmplifyOAuth2AuthRuleSpec (management.v1alpha1.AmplifyOAuth2AuthRule) type AmplifyOAuth2AuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go index 90b56ddbd..79ab97829 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_spec.go @@ -9,9 +9,9 @@ package management -// AmplifyRuntimeConfigSpec struct for AmplifyRuntimeConfigSpec +// AmplifyRuntimeConfigSpec (management.v1alpha1.AmplifyRuntimeConfig) type AmplifyRuntimeConfigSpec struct { - // The runtime config. + // The runtime config. (management.v1alpha1.AmplifyRuntimeConfig) RuntimeConfig map[string]interface{} `json:"runtimeConfig"` AmplifyConfig string `json:"amplifyConfig"` ExternalSecrets []map[string]interface{} `json:"externalSecrets,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go index 550da1862..d05629f1a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_amplify_runtime_config_status.go @@ -9,7 +9,7 @@ package management -// AmplifyRuntimeConfigStatus struct for AmplifyRuntimeConfigStatus +// AmplifyRuntimeConfigStatus (management.v1alpha1.AmplifyRuntimeConfig) type AmplifyRuntimeConfigStatus struct { Name string `json:"name"` // Description of the phase. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go index 93db465e2..8b55927d1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_key_auth_rule_spec.go @@ -9,7 +9,7 @@ package management -// ApiKeyAuthRuleSpec struct for ApiKeyAuthRuleSpec +// ApiKeyAuthRuleSpec (management.v1alpha1.APIKeyAuthRule) type ApiKeyAuthRuleSpec struct { // The description of the authentication rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go index 0342e0e11..c2fbac11e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_details.go @@ -9,7 +9,7 @@ package management -// ApiServiceDetails struct for ApiServiceDetails +// ApiServiceDetails (management.v1alpha1.APIService) type ApiServiceDetails struct { // Specification type for the API Service. SpecType string `json:"specType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go index 2290f27f6..64b4d5468 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceInstanceSpec struct for ApiServiceInstanceSpec +// ApiServiceInstanceSpec (management.v1alpha1.APIServiceInstance) type ApiServiceInstanceSpec struct { ApiServiceRevision string `json:"apiServiceRevision"` AccessRequestDefinition string `json:"accessRequestDefinition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go index 6e3c14e6b..9e4625054 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_endpoint.go @@ -9,7 +9,7 @@ package management -// ApiServiceInstanceSpecEndpoint struct for ApiServiceInstanceSpecEndpoint +// ApiServiceInstanceSpecEndpoint (management.v1alpha1.APIServiceInstance) type ApiServiceInstanceSpecEndpoint struct { Host string `json:"host"` Port int32 `json:"port,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go index c671ed1eb..d6958e78f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_instance_spec_routing.go @@ -9,11 +9,11 @@ package management -// ApiServiceInstanceSpecRouting struct for ApiServiceInstanceSpecRouting +// ApiServiceInstanceSpecRouting (management.v1alpha1.APIServiceInstance) type ApiServiceInstanceSpecRouting struct { // The base path to the API. Example: '/api'. BasePath string `json:"basePath,omitempty"` - // Specify any additional routing details needed + // Specify any additional routing details needed (management.v1alpha1.APIServiceInstance) // GENERATE: The following code has been modified after code generation Details map[string]interface{} `json:"details,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go index 343801ab3..519391a96 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceRevisionSpec struct for ApiServiceRevisionSpec +// ApiServiceRevisionSpec (management.v1alpha1.APIServiceRevision) type ApiServiceRevisionSpec struct { ApiService string `json:"apiService"` Definition ApiServiceRevisionSpecDefinition `json:"definition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go index 685a74ce4..d6ec995de 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_revision_spec_definition.go @@ -9,7 +9,7 @@ package management -// ApiServiceRevisionSpecDefinition The api specification details. +// ApiServiceRevisionSpecDefinition The api specification details. (management.v1alpha1.APIServiceRevision) type ApiServiceRevisionSpecDefinition struct { // The type of the api specification. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go index f4bc24f3f..889c3e636 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec.go @@ -9,7 +9,7 @@ package management -// ApiServiceSpec struct for ApiServiceSpec +// ApiServiceSpec (management.v1alpha1.APIService) type ApiServiceSpec struct { // The description of the api service. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go index 4b820370d..0d5087db4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_spec_icon.go @@ -9,7 +9,7 @@ package management -// ApiServiceSpecIcon Image for the APIService. +// ApiServiceSpecIcon Image for the APIService. (management.v1alpha1.APIService) type ApiServiceSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go index 7e853bfa6..d2376f082 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_service_status.go @@ -9,7 +9,7 @@ package management -// ApiServiceStatus struct for ApiServiceStatus +// ApiServiceStatus (management.v1alpha1.APIService) type ApiServiceStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go index a39a8b5a5..f8d6f22f4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpec struct for ApiSpecSpec +// ApiSpecSpec (management.v1alpha1.APISpec) type ApiSpecSpec struct { SpecDiscoveryRef string `json:"specDiscoveryRef,omitempty"` Definition ApiSpecSpecDefinition `json:"definition,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go index 9e83de0b9..cfe8b7094 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_definition.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpecDefinition struct for ApiSpecSpecDefinition +// ApiSpecSpecDefinition (management.v1alpha1.APISpec) type ApiSpecSpecDefinition struct { // The type of the api specification. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go index 639b3c0cd..5722de40e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_api_spec_spec_endpoints.go @@ -9,7 +9,7 @@ package management -// ApiSpecSpecEndpoints struct for ApiSpecSpecEndpoints +// ApiSpecSpecEndpoints (management.v1alpha1.APISpec) type ApiSpecSpecEndpoints struct { // The type of the endpoint. Type string `json:"type,omitempty"` @@ -19,6 +19,6 @@ type ApiSpecSpecEndpoints struct { Port string `json:"port,omitempty"` // The path on which this spec was discovered. Path string `json:"path,omitempty"` - // The labels for the pod this spec was discovered on. + // The labels for the pod this spec was discovered on. (management.v1alpha1.APISpec) Labels map[string]string `json:"labels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go index 86daf83b2..4e4e30311 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec.go @@ -9,7 +9,7 @@ package management -// AssetMappingSpec struct for AssetMappingSpec +// AssetMappingSpec (management.v1alpha1.AssetMapping) type AssetMappingSpec struct { // Reference to the executed AssetMappingTemplate. AssetMappingTemplate string `json:"assetMappingTemplate,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go index 4d64e7f7a..e86f75b06 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_spec_inputs.go @@ -9,7 +9,7 @@ package management -// AssetMappingSpecInputs The list of the inputs provided to the template. +// AssetMappingSpecInputs The list of the inputs provided to the template. (management.v1alpha1.AssetMapping) type AssetMappingSpecInputs struct { ApiService string `json:"apiService"` ApiServiceRevision string `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go index c1b4c0ed0..f547f5383 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatus struct for AssetMappingStatus +// AssetMappingStatus (management.v1alpha1.AssetMapping) type AssetMappingStatus struct { Level string `json:"level,omitempty"` Source AssetMappingStatusSource `json:"source,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go index d851d320a..02c630a18 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_outputs.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusOutputs struct for AssetMappingStatusOutputs +// AssetMappingStatusOutputs (management.v1alpha1.AssetMapping) type AssetMappingStatusOutputs struct { Resource AssetMappingStatusResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go index f4616f207..1fd3809e0 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. +// AssetMappingStatusResource The resources that were impacted with the trigger of asset mapping. (management.v1alpha1.AssetMapping) type AssetMappingStatusResource struct { AssetResource AssetMappingStatusResourceAssetResource `json:"assetResource,omitempty"` Stage AssetMappingStatusResourceStage `json:"stage,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go index 0225ee397..8fb411957 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_asset_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResourceAssetResource struct for AssetMappingStatusResourceAssetResource +// AssetMappingStatusResourceAssetResource (management.v1alpha1.AssetMapping) type AssetMappingStatusResourceAssetResource struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go index 3fca3bac4..028c933b9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_resource_stage.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusResourceStage struct for AssetMappingStatusResourceStage +// AssetMappingStatusResourceStage (management.v1alpha1.AssetMapping) type AssetMappingStatusResourceStage struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go index d7240edbd..b302e45cf 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSource struct for AssetMappingStatusSource +// AssetMappingStatusSource (management.v1alpha1.AssetMapping) type AssetMappingStatusSource struct { Resource AssetMappingStatusSourceResource `json:"resource,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go index a62b3889b..3502d5316 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. +// AssetMappingStatusSourceResource The resource that triggered the Asset Mapping. (management.v1alpha1.AssetMapping) type AssetMappingStatusSourceResource struct { ApiService AssetMappingStatusSourceResourceApiService `json:"apiService,omitempty"` ApiServiceRevision AssetMappingStatusSourceResourceApiServiceRevision `json:"apiServiceRevision,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go index 11bf478e7..f8d5ce97f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiService struct for AssetMappingStatusSourceResourceApiService +// AssetMappingStatusSourceResourceApiService (management.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiService struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go index 70e958af0..3ed5207f5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_instance.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiServiceInstance struct for AssetMappingStatusSourceResourceApiServiceInstance +// AssetMappingStatusSourceResourceApiServiceInstance (management.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiServiceInstance struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go index a45a85073..51ba28567 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_api_service_revision.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceApiServiceRevision struct for AssetMappingStatusSourceResourceApiServiceRevision +// AssetMappingStatusSourceResourceApiServiceRevision (management.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceApiServiceRevision struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go index 9ec01d2f6..ebfc24ceb 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_status_source_resource_asset_mapping_template.go @@ -9,7 +9,7 @@ package management -// AssetMappingStatusSourceResourceAssetMappingTemplate struct for AssetMappingStatusSourceResourceAssetMappingTemplate +// AssetMappingStatusSourceResourceAssetMappingTemplate (management.v1alpha1.AssetMapping) type AssetMappingStatusSourceResourceAssetMappingTemplate struct { Ref string `json:"ref,omitempty"` // GENERATE: The following code has been modified after code generation diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go index 19f23eabb..6026b2e46 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpec struct for AssetMappingTemplateSpec +// AssetMappingTemplateSpec (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpec struct { // A list of filters for the API Service resource on which the template applies. Filters []AssetMappingTemplateSpecFilters `json:"filters,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go index 47b6a5eda..14fb9cdca 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service.go @@ -9,11 +9,11 @@ package management -// AssetMappingTemplateSpecApiService struct for AssetMappingTemplateSpecApiService +// AssetMappingTemplateSpecApiService (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpecApiService struct { // The name of the API Service. Name string `json:"name,omitempty"` - // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. + // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) Attributes map[string]string `json:"attributes,omitempty"` ApiServiceRevision AssetMappingTemplateSpecApiServiceRevision `json:"apiServiceRevision,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go index 345ca864d..a9e6c2529 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision.go @@ -9,9 +9,9 @@ package management -// AssetMappingTemplateSpecApiServiceRevision struct for AssetMappingTemplateSpecApiServiceRevision +// AssetMappingTemplateSpecApiServiceRevision (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpecApiServiceRevision struct { - // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. + // Attributes used to filter the APIServiceRevisions for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) Attributes map[string]string `json:"attributes,omitempty"` ApiServiceInstance AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance `json:"apiServiceInstance,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go index ac805ed94..33f055089 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_api_service_revision_api_service_instance.go @@ -9,8 +9,8 @@ package management -// AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance struct for AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance +// AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpecApiServiceRevisionApiServiceInstance struct { - // Attributes used to filter the APIServiceInstances for the API Service on which the template applies. + // Attributes used to filter the APIServiceInstances for the API Service on which the template applies. (management.v1alpha1.AssetMappingTemplate) Attributes map[string]string `json:"attributes,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go index 2060752ae..8ceadc0d7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_asset.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpecAsset struct for AssetMappingTemplateSpecAsset +// AssetMappingTemplateSpecAsset (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpecAsset struct { // name of the asset or a template for name Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go index 37b5cacd3..dae36cb6b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_asset_mapping_template_spec_filters.go @@ -9,7 +9,7 @@ package management -// AssetMappingTemplateSpecFilters struct for AssetMappingTemplateSpecFilters +// AssetMappingTemplateSpecFilters (management.v1alpha1.AssetMappingTemplate) type AssetMappingTemplateSpecFilters struct { ApiService []AssetMappingTemplateSpecApiService `json:"apiService,omitempty"` // name of the stage diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go index 4b3b42035..f684ca657 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_references.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceReferences struct for ConsumerInstanceReferences +// ConsumerInstanceReferences (management.v1alpha1.ConsumerInstance) type ConsumerInstanceReferences struct { // Reference to Amplify Central APIService ApiService string `json:"apiService,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go index 81a0c235d..be3016d91 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpec struct for ConsumerInstanceSpec +// ConsumerInstanceSpec (management.v1alpha1.ConsumerInstance) type ConsumerInstanceSpec struct { // Maps to the name of the Catalog Item. If not provided, the resource title will be used. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go index 9a9d1b076..29cb4ccca 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_additional_data_properties.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecAdditionalDataProperties The Catalog Item properties for additional data. +// ConsumerInstanceSpecAdditionalDataProperties The Catalog Item properties for additional data. (management.v1alpha1.ConsumerInstance) type ConsumerInstanceSpecAdditionalDataProperties struct { // Defines the unstructured data type. Example 'APIBuilderConnector' or 'SDK'. Type string `json:"type"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go index 60df13b4a..80df37ed9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_icon.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecIcon Image for the Catalog Item. If not present, the icon on the APISevice will be used in the Catalog Item. +// ConsumerInstanceSpecIcon Image for the Catalog Item. If not present, the icon on the APISevice will be used in the Catalog Item. (management.v1alpha1.ConsumerInstance) type ConsumerInstanceSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go index bc7283a24..9f4335df9 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_subscription.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecSubscription struct for ConsumerInstanceSpecSubscription +// ConsumerInstanceSpecSubscription (management.v1alpha1.ConsumerInstance) type ConsumerInstanceSpecSubscription struct { // Defines if subscriptions are allowed on the Catalog Item. Enabled bool `json:"enabled,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go index 133936c10..8785b8e91 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_spec_unstructured_data_properties.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceSpecUnstructuredDataProperties The Catalog Item properties for unstructured definition subtypes. +// ConsumerInstanceSpecUnstructuredDataProperties The Catalog Item properties for unstructured definition subtypes. (management.v1alpha1.ConsumerInstance) type ConsumerInstanceSpecUnstructuredDataProperties struct { // Defines the unstructured data type. Example 'APIBuilderConnector' or 'SDK'. Type string `json:"type"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go index e61ff5529..c48eff33c 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status.go @@ -9,7 +9,7 @@ package management -// ConsumerInstanceStatus struct for ConsumerInstanceStatus +// ConsumerInstanceStatus (management.v1alpha1.ConsumerInstance) type ConsumerInstanceStatus struct { Phase ConsumerInstanceStatusPhase `json:"phase"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go index 0d258d6c1..abcad7dd5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_instance_status_phase.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// ConsumerInstanceStatusPhase struct for ConsumerInstanceStatusPhase +// ConsumerInstanceStatusPhase (management.v1alpha1.ConsumerInstance) type ConsumerInstanceStatusPhase struct { Name string `json:"name"` // The criticality of the last update diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go index deec9ce29..327fafc22 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec.go @@ -9,7 +9,7 @@ package management -// ConsumerSubscriptionDefinitionSpec struct for ConsumerSubscriptionDefinitionSpec +// ConsumerSubscriptionDefinitionSpec (management.v1alpha1.ConsumerSubscriptionDefinition) type ConsumerSubscriptionDefinitionSpec struct { // List of Webhook kind resource names that dictates what webhooks will be invoked on subscription changes. Webhooks []string `json:"webhooks,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go index 5d3046b6b..58c5bcc21 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema.go @@ -9,7 +9,7 @@ package management -// ConsumerSubscriptionDefinitionSpecSchema Subscription definition properties to be used by the consumers. +// ConsumerSubscriptionDefinitionSpecSchema Subscription definition properties to be used by the consumers. (management.v1alpha1.ConsumerSubscriptionDefinition) type ConsumerSubscriptionDefinitionSpecSchema struct { // Defines the subscription schema properties as key/value pairs. Properties []ConsumerSubscriptionDefinitionSpecSchemaProperties `json:"properties,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go index 5302684ed..2d0609005 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_consumer_subscription_definition_spec_schema_properties.go @@ -9,10 +9,10 @@ package management -// ConsumerSubscriptionDefinitionSpecSchemaProperties struct for ConsumerSubscriptionDefinitionSpecSchemaProperties +// ConsumerSubscriptionDefinitionSpecSchemaProperties (management.v1alpha1.ConsumerSubscriptionDefinition) type ConsumerSubscriptionDefinitionSpecSchemaProperties struct { // The Catalog Item subscription spec key. For API type subscriptions, the key needs to be 'profile'. Key string `json:"key"` - // JSON schema to specify data needed from consumers when subscriptions are created. + // JSON schema to specify data needed from consumers when subscriptions are created. (management.v1alpha1.ConsumerSubscriptionDefinition) Value map[string]interface{} `json:"value"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go index 09f20f259..763dbada1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_cors_rule_spec.go @@ -9,7 +9,7 @@ package management -// CorsRuleSpec struct for CorsRuleSpec +// CorsRuleSpec (management.v1alpha1.CorsRule) type CorsRuleSpec struct { // CORS configuration rule. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go index 2509dbde8..65a6dcba5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_policies_expiry.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// CredentialPoliciesExpiry struct for CredentialPoliciesExpiry +// CredentialPoliciesExpiry (management.v1alpha1.Credential) type CredentialPoliciesExpiry struct { // Time when the Credential is set to be expired. Timestamp time.Time `json:"timestamp"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go index 1d5dfc373..ea1fb185d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_references.go @@ -9,7 +9,7 @@ package management -// CredentialReferences struct for CredentialReferences +// CredentialReferences (management.v1alpha1.Credential) type CredentialReferences struct { // Name of the catalog Application for which the initial Credential was generated Application string `json:"application,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go index 2cd0aef4b..17da9c6bd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_references.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionReferences struct for CredentialRequestDefinitionReferences +// CredentialRequestDefinitionReferences (management.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionReferences struct { // The name of the CredentialRequestDefinition from an Environment. CredentialReqDef string `json:"credentialReqDef,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go index 1081acf8b..9a89ae8e7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. +// CredentialRequestDefinitionSpecProvisionPoliciesExpiry Expiry properties for Credentials linked to this definition. (management.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvisionPoliciesExpiry struct { // The number of days after the Credentials are considered to be expired. Period int32 `json:"period"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go index 8b70666b8..4821e9d20 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_request_definition_spec_provision_policies_expiry_actions.go @@ -9,7 +9,7 @@ package management -// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct for CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions +// CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions (management.v1alpha1.CredentialRequestDefinition) type CredentialRequestDefinitionSpecProvisionPoliciesExpiryActions struct { // The type of the action taken when the Credential using this definition expires. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go index 59b5f0947..af5137bfa 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec.go @@ -9,13 +9,13 @@ package management -// CredentialSpec struct for CredentialSpec +// CredentialSpec (management.v1alpha1.Credential) type CredentialSpec struct { // Reference to Credential Request Definition resource CredentialRequestDefinition string `json:"credentialRequestDefinition"` // Reference to the ManagedApplication for which the Credential belongs to ManagedApplication string `json:"managedApplication"` - // data matching the credential request definition schema. + // data matching the credential request definition schema. (management.v1alpha1.Credential) Data map[string]interface{} `json:"data"` State CredentialSpecState `json:"state,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go index 979b485dc..8fc863f1b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_spec_state.go @@ -9,7 +9,7 @@ package management -// CredentialSpecState Desired state of the Credential. +// CredentialSpecState Desired state of the Credential. (management.v1alpha1.Credential) type CredentialSpecState struct { Name string `json:"name"` // Additional info on the desired state. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go index 4acd9cf6c..4ed4a8e2d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_state.go @@ -9,7 +9,7 @@ package management -// CredentialState Current state of the Credential. +// CredentialState Current state of the Credential. (management.v1alpha1.Credential) type CredentialState struct { Name string `json:"name"` // Additional info on the state. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go index 0dddf8348..df4029e9f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status.go @@ -9,10 +9,10 @@ package management -// CredentialStatus struct for CredentialStatus +// CredentialStatus (management.v1alpha1.Credential) type CredentialStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` // Reasons for the generated status. - Reasons []AccessRequestStatusReasons `json:"reasons,omitempty"` + Reasons []CredentialStatusReasons `json:"reasons,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go new file mode 100644 index 000000000..b43a275f5 --- /dev/null +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_credential_status_reasons.go @@ -0,0 +1,28 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package management + +import ( + // GENERATE: The following code has been modified after code generation + // + // "time" + time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" +) + +// CredentialStatusReasons (management.v1alpha1.Credential) +type CredentialStatusReasons struct { + Type string `json:"type"` + // Details of the error. + Detail string `json:"detail"` + // Time when the update occurred. + Timestamp time.Time `json:"timestamp"` + // (management.v1alpha1.Credential) + Meta map[string]map[string]interface{} `json:"meta,omitempty"` +} diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go index c9479af20..987747f3c 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_references.go @@ -9,7 +9,7 @@ package management -// DeploymentReferences struct for DeploymentReferences +// DeploymentReferences (management.v1alpha1.Deployment) type DeploymentReferences struct { // Reference to the API Service that got created from this deployment. ApiService string `json:"apiService,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go index 646e0591b..209bd5e13 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_spec.go @@ -9,7 +9,7 @@ package management -// DeploymentSpec struct for DeploymentSpec +// DeploymentSpec (management.v1alpha1.Deployment) type DeploymentSpec struct { // The name of an APIServiceInstance resource that specifies where the API is deployed. VirtualAPIRelease string `json:"virtualAPIRelease"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go index a457d9bc6..f9f8b1638 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_deployment_status.go @@ -9,7 +9,7 @@ package management -// DeploymentStatus struct for DeploymentStatus +// DeploymentStatus (management.v1alpha1.Deployment) type DeploymentStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go index 82539866d..b6b13b403 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpec struct for DiscoveryAgentSpec +// DiscoveryAgentSpec (management.v1alpha1.DiscoveryAgent) type DiscoveryAgentSpec struct { // The dataplane type that this agent connects to DataplaneType string `json:"dataplaneType"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go index 59fd25581..9764a40f5 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_config.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpecConfig Represents the discovery agent config +// DiscoveryAgentSpecConfig Represents the discovery agent config (management.v1alpha1.DiscoveryAgent) type DiscoveryAgentSpecConfig struct { // Defines the tag based filter expression to be evaluated for discovering the API from the API Gateway. The filter value is a conditional expression that can use logical operators to compare two value. The conditional expression must have \"tag\" as the prefix/selector in the symbol name. For e.g. ``` tag.SOME_TAG == \"somevalue\" ``` The expression can be a simple condition as shown above or compound condition in which more than one simple conditions are evaluated using logical operator. For e.g. ``` tag.SOME_TAG == \"somevalue\" || tag.ANOTHER_TAG != \"some_other_value\" ``` In addition to logical expression, the filter can hold call based expressions. Below are the list of supported call expressions #### Exists Exists call can be made to evaluate if the tag name exists in the list of tags on API. This call expression can be used as unary expression For e.g. ``` tag.SOME_TAG.Exists() ``` #### Any Any call can be made in a simple expression to evaluate if the tag with any name has specified value or not in the list of tags on the API. For e.g. ``` tag.Any() == \"Tag with some value\" || tag.Any() != \"Tag with other value\" ``` #### Contains Contains call can be made in a simple expression to evaluate if the the specified tag contains specified argument as value. This call expression requires string argument that will be used to perform lookup in tag value For e.g. ``` tag.Contains(\"somevalue\") ``` #### MatchRegEx MatchRegEx call can be used for evaluating the specified tag value to match specified regular expression. This call expression requires a regular expression as the argument. For e.g. ``` tag.MatchRegEx(\"(some){1}\") ``` Filter string `json:"filter,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go index cdfe4f0dc..ee0b86f91 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_spec_logging.go @@ -9,7 +9,7 @@ package management -// DiscoveryAgentSpecLogging Logging config +// DiscoveryAgentSpecLogging Logging config (management.v1alpha1.DiscoveryAgent) type DiscoveryAgentSpecLogging struct { // Defines the log level. Level string `json:"level,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go index 19a3773bc..4f60d5628 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_discovery_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// DiscoveryAgentStatus struct for DiscoveryAgentStatus +// DiscoveryAgentStatus (management.v1alpha1.DiscoveryAgent) type DiscoveryAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go index df7d79d58..9355ba4c4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec.go @@ -9,10 +9,11 @@ package management -// EnvironmentSpec struct for EnvironmentSpec +// EnvironmentSpec (management.v1alpha1.Environment) type EnvironmentSpec struct { - Description string `json:"description,omitempty"` - Variables map[string]string `json:"variables,omitempty"` + Description string `json:"description,omitempty"` + // (management.v1alpha1.Environment) + Variables map[string]string `json:"variables,omitempty"` // Production environment will be used to perform production processing or connect to a non-Axway gateway. This usage will count against your entitled quota. Production bool `json:"production,omitempty"` // Axway Managed environment is hosted in the Axway Managed Cloud. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go index 03d96189b..13e078211 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_environment_spec_icon.go @@ -9,7 +9,7 @@ package management -// EnvironmentSpecIcon Image for the Environment. +// EnvironmentSpecIcon Image for the Environment. (management.v1alpha1.Environment) type EnvironmentSpecIcon struct { // Content-Type of the image. ContentType string `json:"contentType,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go index c56c3964f..71ced93bc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_external_secret_spec.go @@ -9,7 +9,7 @@ package management -// ExternalSecretSpec struct for ExternalSecretSpec +// ExternalSecretSpec (management.v1alpha1.ExternalSecret) type ExternalSecretSpec struct { // GENERATE: The following code has been modified after code generation Config interface{} `json:"config"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go index 795e76708..046244344 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_agentconfigstatus.go @@ -9,7 +9,7 @@ package management -// GovernanceAgentAgentconfigstatus struct for GovernanceAgentAgentconfigstatus +// GovernanceAgentAgentconfigstatus (management.v1alpha1.GovernanceAgent) type GovernanceAgentAgentconfigstatus struct { // Version of the config. ResourceVersion string `json:"resourceVersion,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go index 2d34342a6..69e6ca733 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_spec.go @@ -9,10 +9,10 @@ package management -// GovernanceAgentSpec struct for GovernanceAgentSpec +// GovernanceAgentSpec (management.v1alpha1.GovernanceAgent) type GovernanceAgentSpec struct { // The dataplane type that this agent connects to DataplaneType string `json:"dataplaneType"` - // Represents the governance agent config + // Represents the governance agent config (management.v1alpha1.GovernanceAgent) Config map[string]interface{} `json:"config,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go index 93fb7e923..e5b69d7ee 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_governance_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// GovernanceAgentStatus struct for GovernanceAgentStatus +// GovernanceAgentStatus (management.v1alpha1.GovernanceAgent) type GovernanceAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go index 859735dae..9497dad5d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_graph_ql_document_spec.go @@ -9,8 +9,9 @@ package management -// GraphQlDocumentSpec struct for GraphQlDocumentSpec +// GraphQlDocumentSpec (management.v1alpha1.GraphQLDocument) type GraphQlDocumentSpec struct { - VirtualService string `json:"virtualService"` - Graphql map[string]interface{} `json:"graphql"` + VirtualService string `json:"virtualService"` + // (management.v1alpha1.GraphQLDocument) + Graphql map[string]interface{} `json:"graphql"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go index 78216a174..488f88480 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_integration_spec.go @@ -9,7 +9,7 @@ package management -// IntegrationSpec struct for IntegrationSpec +// IntegrationSpec (management.v1alpha1.Integration) type IntegrationSpec struct { Description string `json:"description,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go index be80cbf2b..9ab1159ee 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_cluster_spec.go @@ -9,7 +9,7 @@ package management -// K8SClusterSpec struct for K8SClusterSpec +// K8SClusterSpec (management.v1alpha1.K8SCluster) type K8SClusterSpec struct { Mesh string `json:"mesh,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go index 8b1900bba..2a92bf18d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec.go @@ -9,12 +9,14 @@ package management -// K8SResourceSpec struct for K8SResourceSpec +// K8SResourceSpec (management.v1alpha1.K8SResource) type K8SResourceSpec struct { ResourceDiscovery string `json:"resourceDiscovery,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` Uid string `json:"uid,omitempty"` OwnerReferences []K8SResourceSpecOwnerReferences `json:"ownerReferences,omitempty"` - ResourceSpec map[string]interface{} `json:"resourceSpec,omitempty"` - ResourceStatus map[string]interface{} `json:"resourceStatus,omitempty"` + // (management.v1alpha1.K8SResource) + ResourceSpec map[string]interface{} `json:"resourceSpec,omitempty"` + // (management.v1alpha1.K8SResource) + ResourceStatus map[string]interface{} `json:"resourceStatus,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go index 1d02d7b8a..7fd4b0ed3 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_k8_s_resource_spec_owner_references.go @@ -9,7 +9,7 @@ package management -// K8SResourceSpecOwnerReferences struct for K8SResourceSpecOwnerReferences +// K8SResourceSpecOwnerReferences (management.v1alpha1.K8SResource) type K8SResourceSpecOwnerReferences struct { Kind string `json:"kind,omitempty"` Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go index 2bf7c4244..fde9dad92 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplace Details about the marketplace Application. +// ManagedApplicationMarketplace Details about the marketplace Application. (management.v1alpha1.ManagedApplication) type ManagedApplicationMarketplace struct { // The name of the Marketplace. Name string `json:"name"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go index 7931d2848..e08699ce7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResource The Marketplace Application resource details. +// ManagedApplicationMarketplaceResource The Marketplace Application resource details. (management.v1alpha1.ManagedApplication) type ManagedApplicationMarketplaceResource struct { Metadata ManagedApplicationMarketplaceResourceMetadata `json:"metadata"` Owner ManagedApplicationMarketplaceResourceOwner `json:"owner,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go index 642e9d5bb..e9ec73e2e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_metadata.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceMetadata Marketplace Application metadata. +// ManagedApplicationMarketplaceResourceMetadata Marketplace Application metadata. (management.v1alpha1.ManagedApplication) type ManagedApplicationMarketplaceResourceMetadata struct { // Id of the user that created the entity. CreateUserId string `json:"createUserId,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go index 1619d3e3e..012a39bab 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceOwner Owner of the Application. +// ManagedApplicationMarketplaceResourceOwner Owner of the Application. (management.v1alpha1.ManagedApplication) type ManagedApplicationMarketplaceResourceOwner struct { // The type of the owner. Type string `json:"type,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go index 5548b92ee..885e863c1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_marketplace_resource_owner_organization.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationMarketplaceResourceOwnerOrganization Organization details. +// ManagedApplicationMarketplaceResourceOwnerOrganization Organization details. (management.v1alpha1.ManagedApplication) type ManagedApplicationMarketplaceResourceOwnerOrganization struct { // Id of the organization. Id string `json:"id"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go index 142f1973a..bb97e6939 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_references.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationReferences struct for ManagedApplicationReferences +// ManagedApplicationReferences (management.v1alpha1.ManagedApplication) type ManagedApplicationReferences struct { // Reference to Application resource Application string `json:"application,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go index eae90dba8..68fd4b93d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationSpec struct for ManagedApplicationSpec +// ManagedApplicationSpec (management.v1alpha1.ManagedApplication) type ManagedApplicationSpec struct { Security ManagedApplicationSpecSecurity `json:"security,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go index f02a8b800..2d5349b29 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_spec_security.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationSpecSecurity struct for ManagedApplicationSpecSecurity +// ManagedApplicationSpecSecurity (management.v1alpha1.ManagedApplication) type ManagedApplicationSpecSecurity struct { // public key to be used to encrypt the credentials linked to this Managed Application. EncryptionKey string `json:"encryptionKey"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go index 5fe764f3a..e807aed3c 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_managed_application_status.go @@ -9,7 +9,7 @@ package management -// ManagedApplicationStatus struct for ManagedApplicationStatus +// ManagedApplicationStatus (management.v1alpha1.ManagedApplication) type ManagedApplicationStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go index 605757172..04afe7cfc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_discovery_spec.go @@ -9,7 +9,7 @@ package management -// MeshDiscoverySpec struct for MeshDiscoverySpec +// MeshDiscoverySpec (management.v1alpha1.MeshDiscovery) type MeshDiscoverySpec struct { // Target environment. EnvironmentRef string `json:"environmentRef"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go index 5d619b822..2a8f3b6f1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec.go @@ -9,9 +9,9 @@ package management -// MeshServiceSpec struct for MeshServiceSpec +// MeshServiceSpec (management.v1alpha1.MeshService) type MeshServiceSpec struct { - // The labels used by the service to match workloads it exposes. + // The labels used by the service to match workloads it exposes. (management.v1alpha1.MeshService) Selector map[string]string `json:"selector,omitempty"` // Reference to the K8SResource derived from the Kubernetes Service. Resource string `json:"resource,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go index 8f8890cb7..6e02e1f4d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_endpoints.go @@ -9,10 +9,10 @@ package management -// MeshServiceSpecEndpoints struct for MeshServiceSpecEndpoints +// MeshServiceSpecEndpoints (management.v1alpha1.MeshService) type MeshServiceSpecEndpoints struct { Workloads []string `json:"workloads,omitempty"` - // A subset is the set of labels one or more workloads has outside the labels in the service selector. + // A subset is the set of labels one or more workloads has outside the labels in the service selector. (management.v1alpha1.MeshService) Subset map[string]string `json:"subset,omitempty"` // Array of references to apispecs discovered by the discovery agent. Specs []string `json:"specs,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go index b6dafa46e..e00c53768 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_service_spec_ports.go @@ -9,7 +9,7 @@ package management -// MeshServiceSpecPorts struct for MeshServiceSpecPorts +// MeshServiceSpecPorts (management.v1alpha1.MeshService) type MeshServiceSpecPorts struct { Name string `json:"name,omitempty"` Port int32 `json:"port,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go index 8ca996e0f..5c5c33075 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec.go @@ -9,11 +9,11 @@ package management -// MeshWorkloadSpec struct for MeshWorkloadSpec +// MeshWorkloadSpec (management.v1alpha1.MeshWorkload) type MeshWorkloadSpec struct { // References to k8sresources making up the workload. Resources []string `json:"resources,omitempty"` - // Labels from the k8sresources making up the workload. + // Labels from the k8sresources making up the workload. (management.v1alpha1.MeshWorkload) Labels map[string]string `json:"labels,omitempty"` // Discovered ports on the workload. Ports []MeshWorkloadSpecPorts `json:"ports,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go index 4b77bb4b2..f48b9a3da 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_ports.go @@ -9,7 +9,7 @@ package management -// MeshWorkloadSpecPorts struct for MeshWorkloadSpecPorts +// MeshWorkloadSpecPorts (management.v1alpha1.MeshWorkload) type MeshWorkloadSpecPorts struct { // The name of the port. Name string `json:"name,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go index 5f92ec7c9..81de60597 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_mesh_workload_spec_specs.go @@ -9,7 +9,7 @@ package management -// MeshWorkloadSpecSpecs API specs exposed by this workload on this port. +// MeshWorkloadSpecSpecs API specs exposed by this workload on this port. (management.v1alpha1.MeshWorkload) type MeshWorkloadSpecSpecs struct { // Array of references to apispecs discovered by the discovery agent. DiscoveredSpecs []string `json:"discoveredSpecs,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go index 77c659d15..78c66008d 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_oas3_document_spec.go @@ -9,8 +9,9 @@ package management -// Oas3DocumentSpec struct for Oas3DocumentSpec +// Oas3DocumentSpec (management.v1alpha1.OAS3Document) type Oas3DocumentSpec struct { - VirtualService string `json:"virtualService"` - Oas map[string]interface{} `json:"oas"` + VirtualService string `json:"virtualService"` + // (management.v1alpha1.OAS3Document) + Oas map[string]interface{} `json:"oas"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go index 15d0ac20f..0a345bbcd 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_spec.go @@ -9,7 +9,7 @@ package management -// ReleaseTagSpec struct for ReleaseTagSpec +// ReleaseTagSpec (management.v1alpha1.ReleaseTag) type ReleaseTagSpec struct { // Description of the Release Tag. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go index b568e466a..299708684 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_release_tag_status.go @@ -9,7 +9,7 @@ package management -// ReleaseTagStatus struct for ReleaseTagStatus +// ReleaseTagStatus (management.v1alpha1.ReleaseTag) type ReleaseTagStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go index e63b006f0..096b7d949 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec.go @@ -9,7 +9,7 @@ package management -// ResourceDiscoverySpec struct for ResourceDiscoverySpec +// ResourceDiscoverySpec (management.v1alpha1.ResourceDiscovery) type ResourceDiscoverySpec struct { Version string `json:"version,omitempty"` Kind string `json:"kind,omitempty"` @@ -20,5 +20,6 @@ type ResourceDiscoverySpec struct { KeepStatusFields []string `json:"keepStatusFields,omitempty"` IgnoreLabels []string `json:"ignoreLabels,omitempty"` Tags []string `json:"tags,omitempty"` - ExtraAttributes map[string]string `json:"extraAttributes,omitempty"` + // (management.v1alpha1.ResourceDiscovery) + ExtraAttributes map[string]string `json:"extraAttributes,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go index 275199217..664a23d9a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_namespace_filter.go @@ -9,7 +9,7 @@ package management -// ResourceDiscoverySpecNamespaceFilter Namespace filter. +// ResourceDiscoverySpecNamespaceFilter Namespace filter. (management.v1alpha1.ResourceDiscovery) type ResourceDiscoverySpecNamespaceFilter struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go index 003c65cee..8a07d2f61 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_discovery_spec_resource_filter.go @@ -9,8 +9,9 @@ package management -// ResourceDiscoverySpecResourceFilter Resource filter. +// ResourceDiscoverySpecResourceFilter Resource filter. (management.v1alpha1.ResourceDiscovery) type ResourceDiscoverySpecResourceFilter struct { - Names []string `json:"names,omitempty"` + Names []string `json:"names,omitempty"` + // (management.v1alpha1.ResourceDiscovery) MatchLabels map[string]string `json:"matchLabels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go index 2eb738584..d43b8fcb7 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpec struct for ResourceHookSpec +// ResourceHookSpec (management.v1alpha1.ResourceHook) type ResourceHookSpec struct { Triggers []ResourceHookSpecTriggers `json:"triggers"` // List of Webhook kind resource names that dictates what webhooks will be invoked on matching triggers. diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go index d1cdc9cc1..640103499 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_scope.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpecScope Resource scope trigger details. +// ResourceHookSpecScope Resource scope trigger details. (management.v1alpha1.ResourceHook) type ResourceHookSpecScope struct { // Value for the Kind of the scope of the resource. Use \"*\" for any. Kind string `json:"kind"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go index 7447cd0a5..6f1f97dde 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_resource_hook_spec_triggers.go @@ -9,7 +9,7 @@ package management -// ResourceHookSpecTriggers struct for ResourceHookSpecTriggers +// ResourceHookSpecTriggers (management.v1alpha1.ResourceHook) type ResourceHookSpecTriggers struct { // Value for the group of the resource. Use \"*\" for any. Group string `json:"group"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go index 3827bb080..f6b80841f 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_secret_spec.go @@ -9,8 +9,8 @@ package management -// SecretSpec struct for SecretSpec +// SecretSpec (management.v1alpha1.Secret) type SecretSpec struct { - // Key value pairs. The value will be stored encrypted. + // Key value pairs. The value will be stored encrypted. (management.v1alpha1.Secret) Data map[string]string `json:"data,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go index 38dc30fbd..d5c3c1fd1 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpec struct for SpecDiscoverySpec +// SpecDiscoverySpec (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpec struct { NamespaceFilter SpecDiscoverySpecNamespaceFilter `json:"namespaceFilter,omitempty"` ResourceFilter SpecDiscoverySpecResourceFilter `json:"resourceFilter,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go index 86ac8eb5e..71e7c8dcc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_namespace_filter.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecNamespaceFilter a list of namespace names to follow. If not set, follows all namespaces. +// SpecDiscoverySpecNamespaceFilter a list of namespace names to follow. If not set, follows all namespaces. (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpecNamespaceFilter struct { Names []string `json:"names,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go index 8bf037437..f31b161ae 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_resource_filter.go @@ -9,8 +9,9 @@ package management -// SpecDiscoverySpecResourceFilter Filter pod resources by name or labels. +// SpecDiscoverySpecResourceFilter Filter pod resources by name or labels. (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpecResourceFilter struct { - Names []string `json:"names,omitempty"` + Names []string `json:"names,omitempty"` + // (management.v1alpha1.SpecDiscovery) MatchLabels map[string]string `json:"matchLabels,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go index d0cbc63f2..ab3aa284a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecTargets struct for SpecDiscoverySpecTargets +// SpecDiscoverySpecTargets (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpecTargets struct { ExactPaths []SpecDiscoverySpecTargetsExactPaths `json:"exactPaths,omitempty"` FromAnnotation []SpecDiscoverySpecTargetsFromAnnotation `json:"fromAnnotation,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go index ef904ab2b..a3ee9a2f8 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_exact_paths.go @@ -9,10 +9,10 @@ package management -// SpecDiscoverySpecTargetsExactPaths struct for SpecDiscoverySpecTargetsExactPaths +// SpecDiscoverySpecTargetsExactPaths (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpecTargetsExactPaths struct { // path to api definition Path string `json:"path,omitempty"` - // headers to add to the query + // headers to add to the query (management.v1alpha1.SpecDiscovery) Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go index e4ef17771..0a05dcfdc 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_spec_discovery_spec_targets_from_annotation.go @@ -9,7 +9,7 @@ package management -// SpecDiscoverySpecTargetsFromAnnotation struct for SpecDiscoverySpecTargetsFromAnnotation +// SpecDiscoverySpecTargetsFromAnnotation (management.v1alpha1.SpecDiscovery) type SpecDiscoverySpecTargetsFromAnnotation struct { // annotation template. golang template that's fed the following object for each declared port of the pod: {\"name\", \"number\"} Template string `json:"template,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go index 1934bd381..f98bee250 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec.go @@ -9,10 +9,10 @@ package management -// TraceabilityAgentSpec struct for TraceabilityAgentSpec +// TraceabilityAgentSpec (management.v1alpha1.TraceabilityAgent) type TraceabilityAgentSpec struct { // The dataplane type that this agent connects to - DataplaneType string `json:"dataplaneType"` - Config TraceabilityAgentSpecConfig `json:"config"` - Logging DiscoveryAgentSpecLogging `json:"logging,omitempty"` + DataplaneType string `json:"dataplaneType"` + Config TraceabilityAgentSpecConfig `json:"config"` + Logging TraceabilityAgentSpecLogging `json:"logging,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go index e6ca926e4..44ae5406e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_config.go @@ -9,7 +9,7 @@ package management -// TraceabilityAgentSpecConfig Represents the traceability agent config +// TraceabilityAgentSpecConfig Represents the traceability agent config (management.v1alpha1.TraceabilityAgent) type TraceabilityAgentSpecConfig struct { // Name of the team that owns the catalog item created by agent. If not provided, the default team will be used. OwningTeam string `json:"owningTeam,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go new file mode 100644 index 000000000..4517f511b --- /dev/null +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_spec_logging.go @@ -0,0 +1,16 @@ +/* + * API Server specification. + * + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * API version: SNAPSHOT + * Generated by: OpenAPI Generator (https://openapi-generator.tech) + */ + +package management + +// TraceabilityAgentSpecLogging Logging config (management.v1alpha1.TraceabilityAgent) +type TraceabilityAgentSpecLogging struct { + // Defines the log level. + Level string `json:"level,omitempty"` +} diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go index 0ba463e21..2d853d7b4 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_traceability_agent_status.go @@ -16,7 +16,7 @@ import ( time "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1" ) -// TraceabilityAgentStatus struct for TraceabilityAgentStatus +// TraceabilityAgentStatus (management.v1alpha1.TraceabilityAgent) type TraceabilityAgentStatus struct { // Version name for the agent revision. Version string `json:"version,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go index c6d7b5785..e9f2cf129 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_release_spec.go @@ -9,7 +9,7 @@ package management -// VirtualApiReleaseSpec struct for VirtualApiReleaseSpec +// VirtualApiReleaseSpec (management.v1alpha1.VirtualAPIRelease) type VirtualApiReleaseSpec struct { // description of the asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go index 4562da104..203abba5c 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_spec.go @@ -9,7 +9,7 @@ package management -// VirtualApiSpec struct for VirtualApiSpec +// VirtualApiSpec (management.v1alpha1.VirtualAPI) type VirtualApiSpec struct { // description of the asset. Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go index 3ffd1b9d1..732e03900 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_api_status.go @@ -9,7 +9,7 @@ package management -// VirtualApiStatus struct for VirtualApiStatus +// VirtualApiStatus (management.v1alpha1.VirtualAPI) type VirtualApiStatus struct { // The current status level, indicating progress towards consistency. Level string `json:"level"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go index 0ceee7676..1bc17241b 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_host_spec.go @@ -9,7 +9,7 @@ package management -// VirtualHostSpec struct for VirtualHostSpec +// VirtualHostSpec (management.v1alpha1.VirtualHost) type VirtualHostSpec struct { // The fully qualifield domain name as described in RFC 1035 Domain string `json:"domain"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go index dd4a18652..27679f2ad 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_virtual_service_spec.go @@ -9,7 +9,7 @@ package management -// VirtualServiceSpec struct for VirtualServiceSpec +// VirtualServiceSpec (management.v1alpha1.VirtualService) type VirtualServiceSpec struct { // The path prefix to match. Example /api/v1 Prefix string `json:"prefix"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go index 5a351b994..55d4552ab 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpec struct for WatchTopicSpec +// WatchTopicSpec (management.v1alpha1.WatchTopic) type WatchTopicSpec struct { // Description of the WatchTopic Description string `json:"description,omitempty"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go index 2ae6470a1..b6042ad8e 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_filters.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpecFilters struct for WatchTopicSpecFilters +// WatchTopicSpecFilters (management.v1alpha1.WatchTopic) type WatchTopicSpecFilters struct { // Value for the group of the resource. Use \"*\" for any. Group string `json:"group"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go index df695ad93..5e13849ed 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_watch_topic_spec_scope.go @@ -9,7 +9,7 @@ package management -// WatchTopicSpecScope Resource scope filter details. +// WatchTopicSpecScope Resource scope filter details. (management.v1alpha1.WatchTopic) type WatchTopicSpecScope struct { // Value for the Kind of the scope of the resource. Use \"*\" for any. Kind string `json:"kind"` diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go index 67837fdf9..a4b10f49a 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec.go @@ -9,11 +9,11 @@ package management -// WebhookSpec struct for WebhookSpec +// WebhookSpec (management.v1alpha1.Webhook) type WebhookSpec struct { Auth WebhookSpecAuth `json:"auth,omitempty"` Enabled bool `json:"enabled,omitempty"` Url string `json:"url"` - // A list of headers that will be sent as par of the http call to the webhook endpoint. + // A list of headers that will be sent as par of the http call to the webhook endpoint. (management.v1alpha1.Webhook) Headers map[string]string `json:"headers,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go index c75935a5a..3db48e727 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth.go @@ -9,7 +9,7 @@ package management -// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. +// WebhookSpecAuth Defines the authentication used to invoke the webhook. When invoking the webhook, the value from the secret/key will be sent in the Authorization header. (management.v1alpha1.Webhook) type WebhookSpecAuth struct { Secret WebhookSpecAuthSecret `json:"secret,omitempty"` } diff --git a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go index 0518329ad..b53cc9665 100644 --- a/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go +++ b/pkg/apic/apiserver/models/management/v1alpha1/model_webhook_spec_auth_secret.go @@ -9,7 +9,7 @@ package management -// WebhookSpecAuthSecret struct for WebhookSpecAuthSecret +// WebhookSpecAuthSecret (management.v1alpha1.Webhook) type WebhookSpecAuthSecret struct { // Secret name to be used as a reference. If the secret is removed, the reference gets removed and the webhook invocation will be done with no Authorization header. Name string `json:"name,omitempty"`