Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: stamp enclave uuid at the end of enclave objects #74

Merged
merged 2 commits into from
Feb 28, 2023
Merged

fix: stamp enclave uuid at the end of enclave objects #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
725f63e
stamp enclave uuid at the end
h4ck3rk3y Feb 28, 2023
3288070
Merge branch 'main' into gyani/rename-kurtosis-api
h4ck3rk3y Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...lib/backend_impls/docker/object_attributes_provider/enclave_object_attributes_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

const (
apiContainerNameSuffix = "kurtosis-api"
apiContainerNamePrefix = "kurtosis-api"
networkingSidecarContainerNameFragment = "networking-sidecar"
artifactExpansionVolumeNameFragment = "files-artifact-expansion"
artifactsExpanderContainerNameFragment = "files-artifacts-expander"
Expand Down Expand Up @@ -158,7 +158,7 @@ func (provider *dockerEnclaveObjectAttributesProviderImpl) ForApiContainer(
) (DockerObjectAttributes, error) {
name, err := provider.getNameForEnclaveObject(
[]string{
apiContainerNameSuffix,
apiContainerNamePrefix,
},
)
if err != nil {
Expand Down Expand Up @@ -422,12 +422,9 @@ func (provider *dockerEnclaveObjectAttributesProviderImpl) ForLogsCollectorVolum
// ====================================================================================================
// Gets the name for an enclave object, making sure to put the enclave ID first and join using the standardized separator
func (provider *dockerEnclaveObjectAttributesProviderImpl) getNameForEnclaveObject(elems []string) (*docker_object_name.DockerObjectName, error) {
toJoin := []string{
provider.enclaveId.GetString(),
}
toJoin = append(toJoin, elems...)
elems = append(elems, provider.enclaveId.GetString())
nameStr := strings.Join(
toJoin,
elems,
objectNameElementSeparator,
)
name, err := docker_object_name.CreateNewDockerObjectName(nameStr)
Expand Down