hide libpq postgres from el appstream repo

Author: Vonng

cli/confgen.go

@@ -985,7 +985,7 @@ repo_upstream_default:
   - { name: nginx          ,description: 'Nginx Repo'         ,module: infra   ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://nginx.org/packages/rhel/$releasever/$basearch/' }}
   - { name: docker-ce      ,description: 'Docker CE'          ,module: infra   ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://download.docker.com/linux/centos/$releasever/$basearch/stable'    ,china: 'https://mirrors.aliyun.com/docker-ce/linux/centos/$releasever/$basearch/stable' ,europe: 'https://mirrors.xtom.de/docker-ce/linux/centos/$releasever/$basearch/stable' } ,meta: { skip_if_unavailable: 1 }}
   - { name: baseos         ,description: 'EL 8+ BaseOS'       ,module: node    ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/BaseOS/$basearch/os/'                        ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/BaseOS/$basearch/os/'                        ,europe: 'https://mirrors.xtom.de/rocky/$releasever/BaseOS/$basearch/os/'     }}
-  - { name: appstream      ,description: 'EL 8+ AppStream'    ,module: node    ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/os/'                     ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/AppStream/$basearch/os/'                     ,europe: 'https://mirrors.xtom.de/rocky/$releasever/AppStream/$basearch/os/'  }}
+  - { name: appstream      ,description: 'EL 8+ AppStream'    ,module: node    ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/AppStream/$basearch/os/'                     ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/AppStream/$basearch/os/'                     ,europe: 'https://mirrors.xtom.de/rocky/$releasever/AppStream/$basearch/os/'  } ,meta: { excludepkgs: 'postgresql* libpq*' }}
   - { name: extras         ,description: 'EL 8+ Extras'       ,module: node    ,releases: [8,9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/extras/$basearch/os/'                        ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/extras/$basearch/os/'                        ,europe: 'https://mirrors.xtom.de/rocky/$releasever/extras/$basearch/os/'     }}
   - { name: powertools     ,description: 'EL 8 PowerTools'    ,module: node    ,releases: [8     ] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/PowerTools/$basearch/os/'                    ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/PowerTools/$basearch/os/'                    ,europe: 'https://mirrors.xtom.de/rocky/$releasever/PowerTools/$basearch/os/' }}
   - { name: crb            ,description: 'EL 9 CRB'           ,module: node    ,releases: [  9,10] ,arch: [x86_64, aarch64] ,baseurl: { default: 'https://dl.rockylinux.org/pub/rocky/$releasever/CRB/$basearch/os/'                           ,china: 'https://mirrors.aliyun.com/rockylinux/$releasever/CRB/$basearch/os/'                           ,europe: 'https://mirrors.xtom.de/rocky/$releasever/CRB/$basearch/os/'        }}

cli/confgen_test.go

@@ -356,6 +356,36 @@ func TestNodePackagesDefaultRenderedAsThreeAlignedGroups(t *testing.T) {
 	}
 }
 
+func TestRPMTemplateAppStreamExcludesDistroPostgreSQLProviders(t *testing.T) {
+	const wantMeta = "meta: { excludepkgs: 'postgresql* libpq*' }"
+
+	for _, osCode := range []string{"el8", "el9", "el10"} {
+		t.Run(osCode, func(t *testing.T) {
+			rendered := renderRPMTemplateForTest(t, osCode+".x86_64", osCode)
+			appstream := renderedRepoUpstreamLine(rendered, "appstream")
+			if appstream == "" {
+				t.Fatal("rendered RPM config missing appstream repo")
+			}
+			if !strings.Contains(appstream, "releases: [8,9,10]") {
+				t.Fatalf("appstream repo no longer covers EL8/9/10: %q", appstream)
+			}
+			if !strings.Contains(appstream, wantMeta) {
+				t.Fatalf("appstream repo missing distro PostgreSQL exclude meta: %q", appstream)
+			}
+
+			for _, repo := range []string{"baseos", "extras", "powertools", "crb", "epel"} {
+				line := renderedRepoUpstreamLine(rendered, repo)
+				if line == "" {
+					t.Fatalf("rendered RPM config missing %s repo", repo)
+				}
+				if strings.Contains(line, "excludepkgs") {
+					t.Fatalf("%s repo should not carry PostgreSQL exclude meta: %q", repo, line)
+				}
+			}
+		})
+	}
+}
+
 func TestNodePackagesDefaultPreservesLegacyPackagesExceptTcpdump(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -696,6 +726,17 @@ func renderedPackageAliasValue(rendered, alias string) string {
 	return ""
 }
 
+func renderedRepoUpstreamLine(rendered, name string) string {
+	prefix := "- { name: " + name
+	for _, line := range strings.Split(rendered, "\n") {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, prefix) {
+			return line
+		}
+	}
+	return ""
+}
+
 func assertContainsAllExcept(t *testing.T, current, legacy []string, except string) {
 	t.Helper()
 	currentSet := tokenSet(current)