Fix merge conflicts

Author: emilioalvap

dev-tools/packaging/package_test.go

@@ -284,87 +284,26 @@ func checkNpcapNotices(pkg, file string, contents io.Reader) error {
 	return nil
 }
 
-<<<<<<< HEAD:dev-tools/packaging/package_test.go
 func checkDocker(t *testing.T, file string) {
-	p, info, err := readDocker(file)
-	if err != nil {
-		t.Errorf("error reading file %v: %v", file, err)
-		return
-=======
-func checkDocker(t *testing.T, file string, fipsPackage bool) (string, int64) {
-	if strings.Contains(file, "elastic-otel-collector") {
-		return checkEdotCollectorDocker(t, file)
-	}
-
 	p, info, err := readDocker(file, true)
 	if err != nil {
 		t.Errorf("error reading file %v: %v", file, err)
-		return "", -1
+		return
 	}
 
 	checkDockerEntryPoint(t, p, info)
 	checkDockerLabels(t, p, info, file)
 	checkDockerUser(t, p, info, *rootUserContainer)
 	checkFilePermissions(t, p, configFilePattern, os.FileMode(0644))
-	if !fipsPackage {
-		// FIPS docker image do not contain an otelcol script, run this check only on non FIPS-capable images
-		checkFilePermissions(t, p, otelcolScriptPattern, os.FileMode(0755))
-	}
+	checkFilePermissions(t, p, otelcolScriptPattern, os.FileMode(0755))
 	checkManifestPermissionsWithMode(t, p, os.FileMode(0644))
 	checkModulesPresent(t, "", p)
 	checkModulesDPresent(t, "", p)
-	checkHintsInputsD(t, "hints.inputs.d", hintsInputsDFilePattern, p)
 	checkLicensesPresent(t, "licenses/", p)
 
 	if strings.Contains(file, "-complete") {
 		checkCompleteDocker(t, file)
 	}
-
-	name, err := dockerName(file, info.Config.Labels)
-	if err != nil {
-		t.Errorf("error constructing docker name: %v", err)
-		return "", -1
-	}
-
-	return name, info.Size
-}
-
-func dockerName(file string, labels map[string]string) (string, error) {
-	version, found := labels["version"]
-	if !found {
-		return "", errors.New("version label not found")
-	}
-
-	parts := strings.Split(file, "/")
-	if len(parts) == 0 {
-		return "", errors.New("failed to get file name parts")
-	}
-
-	lastPart := parts[len(parts)-1]
-	versionIdx := strings.Index(lastPart, version)
-	if versionIdx < 0 {
-		return "", fmt.Errorf("version not found in nam %q", file)
-	}
-	return lastPart[:versionIdx-1], nil
-}
-
-func checkEdotCollectorDocker(t *testing.T, file string) (string, int64) {
-	p, info, err := readDocker(file, true)
-	if err != nil {
-		t.Errorf("error reading file %v: %v", file, err)
-		return "", -1
->>>>>>> f8c1f2ef0 ([Synthetics] Add e2e test for synthetics deps in complete variants (#8605)):dev-tools/packaging/testing/package_test.go
-	}
-
-	checkDockerEntryPoint(t, p, info)
-	checkDockerLabels(t, p, info, file)
-	checkDockerUser(t, p, info, *rootUserContainer)
-	checkFilePermissions(t, p, configFilePattern, os.FileMode(0644))
-	checkFilePermissions(t, p, otelcolScriptPattern, os.FileMode(0755))
-	checkManifestPermissionsWithMode(t, p, os.FileMode(0644))
-	checkModulesPresent(t, "", p)
-	checkModulesDPresent(t, "", p)
-	checkLicensesPresent(t, "licenses/", p)
 }
 
 func checkCompleteDocker(t *testing.T, file string) {