Skip to content

Commit 156de8a

Browse files
Fix empty Name field handling in ValidateEastWestConnectivity
- Provide default 'test-connectivity' name when attrs.Name is empty - Prevents malformed instance names like '-east' and '-west' - Ensures proper SSH key association for test instances - Fixes SSH authentication failure in CI tests Co-Authored-By: Alec Fong <alecsanf@usc.edu>
1 parent f66e11f commit 156de8a

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

pkg/v1/networking.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ func ValidateEastWestConnectivity(ctx context.Context, client CloudCreateTermina
113113
func createTestInstances(ctx context.Context, client CloudCreateTerminateInstance, attrs CreateInstanceAttrs) (*Instance, *Instance, error) {
114114
attrs1 := attrs
115115
attrs1.RefID = uuid.New().String()
116-
name1, err := makeDebuggableName(fmt.Sprintf("%s-east", attrs.Name))
116+
baseName := attrs.Name
117+
if baseName == "" {
118+
baseName = "test-connectivity"
119+
}
120+
name1, err := makeDebuggableName(fmt.Sprintf("%s-east", baseName))
117121
if err != nil {
118122
return nil, nil, fmt.Errorf("failed to generate debuggable name for first instance: %w", err)
119123
}
@@ -126,7 +130,11 @@ func createTestInstances(ctx context.Context, client CloudCreateTerminateInstanc
126130

127131
attrs2 := attrs
128132
attrs2.RefID = uuid.New().String()
129-
name2, err := makeDebuggableName(fmt.Sprintf("%s-west", attrs.Name))
133+
baseName2 := attrs.Name
134+
if baseName2 == "" {
135+
baseName2 = "test-connectivity"
136+
}
137+
name2, err := makeDebuggableName(fmt.Sprintf("%s-west", baseName2))
130138
if err != nil {
131139
return instance1, nil, fmt.Errorf("failed to generate debuggable name for second instance: %w", err)
132140
}

0 commit comments

Comments
 (0)