mirror of
https://github.com/status-im/consul.git
synced 2025-01-12 06:44:41 +00:00
a72f868218
This updates the testing/deployer (aka "topology test") framework to conditionally configure and launch catalog constructs using v2 resources. This is controlled via a Version field on the Node construct in a topology.Config. This only functions for a dataplane type and has other restrictions that match the rest of v2 (no peering, no wanfed, no mesh gateways). Like config entries, you can statically provide a set of initial resources to be synced when bringing up the cluster (beyond those that are generated for you such as workloads, services, etc). If you want to author a test that can be freely converted between v1 and v2 then that is possible. If you switch to the multi-port definition on a topology.Service (aka "workload/instance") then that makes v1 ineligible. This also adds a starter set of "on every PR" integration tests for single and multiport under test-integ/catalogv2
82 lines
2.1 KiB
Go
82 lines
2.1 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package util
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/consul/proto-public/pbresource"
|
|
)
|
|
|
|
// functions copied out of consul:internal/resource/*.go
|
|
|
|
// IDToString returns a string representation of pbresource.ID. This should not
|
|
// be relied upon nor parsed and is provided just for debugging and logging
|
|
// reasons.
|
|
//
|
|
// This format should be aligned with ReferenceToString and
|
|
// (ReferenceKey).String.
|
|
func IDToString(id *pbresource.ID) string {
|
|
s := fmt.Sprintf("%s/%s/%s",
|
|
TypeToString(id.Type),
|
|
TenancyToString(id.Tenancy),
|
|
id.Name,
|
|
)
|
|
if id.Uid != "" {
|
|
return s + "?uid=" + id.Uid
|
|
}
|
|
return s
|
|
}
|
|
|
|
// ReferenceToString returns a string representation of pbresource.Reference.
|
|
// This should not be relied upon nor parsed and is provided just for debugging
|
|
// and logging reasons.
|
|
//
|
|
// This format should be aligned with IDToString and (ReferenceKey).String.
|
|
func ReferenceToString(ref *pbresource.Reference) string {
|
|
s := fmt.Sprintf("%s/%s/%s",
|
|
TypeToString(ref.Type),
|
|
TenancyToString(ref.Tenancy),
|
|
ref.Name,
|
|
)
|
|
|
|
if ref.Section != "" {
|
|
return s + "?section=" + ref.Section
|
|
}
|
|
return s
|
|
}
|
|
|
|
// TenancyToString returns a string representation of pbresource.Tenancy. This
|
|
// should not be relied upon nor parsed and is provided just for debugging and
|
|
// logging reasons.
|
|
func TenancyToString(tenancy *pbresource.Tenancy) string {
|
|
return fmt.Sprintf("%s.%s.%s", tenancy.Partition, tenancy.PeerName, tenancy.Namespace)
|
|
}
|
|
|
|
// TypeToString returns a string representation of pbresource.Type. This should
|
|
// not be relied upon nor parsed and is provided just for debugging and logging
|
|
// reasons.
|
|
func TypeToString(typ *pbresource.Type) string {
|
|
return ToGVK(typ)
|
|
}
|
|
|
|
func ToGVK(resourceType *pbresource.Type) string {
|
|
return fmt.Sprintf("%s.%s.%s", resourceType.Group, resourceType.GroupVersion, resourceType.Kind)
|
|
}
|
|
|
|
// EqualType compares two resource types for equality without reflection.
|
|
func EqualType(a, b *pbresource.Type) bool {
|
|
if a == b {
|
|
return true
|
|
}
|
|
|
|
if a == nil || b == nil {
|
|
return false
|
|
}
|
|
|
|
return a.Group == b.Group &&
|
|
a.GroupVersion == b.GroupVersion &&
|
|
a.Kind == b.Kind
|
|
}
|