Fix proto registration for beholder (#2198)

Author: Tofel

framework/.changeset/v0.11.2.md

@@ -0,0 +1 @@
+- Fix concurrent map write when streaming Docker logs

framework/components/dockercompose/.changeset/v0.1.16.md

@@ -0,0 +1,3 @@
+- Fix prefix stripping from proto package names
+- Add `_` to valid character in proto package name (fix for `bridge_status` package)
+- Update `chainlink-protos` SHA used in tests to `latest`

framework/components/dockercompose/chip_ingress_set/protos.go

@@ -139,15 +139,16 @@ func RegisterAndFetchProtos(ctx context.Context, client *github.Client, protoSch
 		// or in other words, we treat "workflows/" folder as the root folder for all protos in this schema set and strip it from the paths derived from the repository structure.
 		prefixesToStrip := determineFolderPrefixesToStrip(protoSchemaSet.Folders)
 
+		strippedProtdMap := make(map[string]string)
+		strippedSubjects := make(map[string]string)
+
 		for path := range protoMap {
 			strippedPath := stripFolderPrefix(path, prefixesToStrip)
-			protoMap[strippedPath] = protoMap[path]
-			subjects[strippedPath] = subjects[path]
-			delete(protoMap, path)
-			delete(subjects, path)
+			strippedProtdMap[strippedPath] = protoMap[path]
+			strippedSubjects[strippedPath] = subjects[path]
 		}
 
-		registerErr := registerAllWithTopologicalSorting(schemaRegistryURL, protoMap, subjects)
+		registerErr := registerAllWithTopologicalSorting(schemaRegistryURL, strippedProtdMap, strippedSubjects)
 		if registerErr != nil {
 			return errors.Wrapf(registerErr, "failed to register protos from %s", protoSchemaSet.URI)
 		}
@@ -174,7 +175,7 @@ func DefaultSubjectNamingStrategy(subjectPrefix string, proto protoFile, protoSc
 // extractPackageNameWithRegex extracts the package name from a proto source file using regex.
 // It returns an error if no package name is found.
 func extractPackageNameWithRegex(protoSrc string) (string, error) {
-	matches := regexp.MustCompile(`(?m)^\s*package\s+([a-zA-Z0-9.]+)\s*;`).FindStringSubmatch(protoSrc)
+	matches := regexp.MustCompile(`(?m)^\s*package\s+([a-zA-Z0-9._]+)\s*;`).FindStringSubmatch(protoSrc)
 	if len(matches) < 2 {
 		return "", fmt.Errorf("no package name found in proto source")
 	}

framework/docker.go

@@ -368,6 +368,7 @@ func StreamContainerLogs(listOptions container.ListOptions, logOptions container
 
 	eg := &errgroup.Group{}
 	logMap := make(map[string]io.ReadCloser)
+	var mutex sync.Mutex
 
 	for _, containerInfo := range containers {
 		eg.Go(func() error {
@@ -378,6 +379,8 @@ func StreamContainerLogs(listOptions container.ListOptions, logOptions container
 				L.Error().Err(err).Str("Container", containerName).Msg("failed to fetch logs for container")
 				return err
 			}
+			mutex.Lock()
+			defer mutex.Unlock()
 			logMap[containerName] = logs
 			return nil
 		})

framework/examples/myproject/smoke_chip_ingress_test.go

@@ -34,7 +34,7 @@ func TestChipIngressSmoke(t *testing.T) {
 		err := chipingressset.DefaultRegisterAndFetchProtos(ctx, nil, []chipingressset.ProtoSchemaSet{
 			{
 				URI:           "https://github.com/smartcontractkit/chainlink-protos",
-				Ref:           "49a301ac36cad84ac8dd7fae6749d3a124b6819b",
+				Ref:           "a653ed4c82a02ec6c0d501dd5af80d02a00009db",
 				Folders:       []string{"workflows"},
 				SubjectPrefix: "cre-",
 			},