feat: change container package fields

Author: mohamadch91

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/nats-io/nats.go v1.36.0
-	github.com/opengovern/og-util v1.5.3
+	github.com/opengovern/og-util v1.6.3
 	github.com/opengovern/opencomply v0.475.2
 	github.com/opengovern/resilient-bridge v0.0.0-20241223164127-85ad8f42a67d
 	github.com/shurcooL/githubv4 v0.0.0-20240727222349-48295856cce7

go.sum

@@ -675,8 +675,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/opengovern/og-util v1.5.3 h1:u6sMV95nOBl0NaQ+qSO0oVWQVjS81fovmmzOmzXPkHQ=
-github.com/opengovern/og-util v1.5.3/go.mod h1:ob8RSaNZG3RWnLH3lDXQaVpIf+B8Ry7ds3twYlDJPp0=
+github.com/opengovern/og-util v1.6.3 h1:QMF+OAEG2O1TzUVVKb7W5jpC8YWFaGfQFMUZzDO8qCg=
+github.com/opengovern/og-util v1.6.3/go.mod h1:ob8RSaNZG3RWnLH3lDXQaVpIf+B8Ry7ds3twYlDJPp0=
 github.com/opengovern/opencomply v0.475.2 h1:JHs12+mhJb9HzFZYMLLgw079PRa+qLKntugvwWiCVL0=
 github.com/opengovern/opencomply v0.475.2/go.mod h1:FsJTfdLz+DDRAzW2/KyCFRxVxM89jMysP7ZfQjaS8+A=
 github.com/opengovern/resilient-bridge v0.0.0-20241223164127-85ad8f42a67d h1:OnoG1Za89armxN1ZlEbr/eKvAdbRN6UGKXCFxee58s0=

pkg/sdk/es/resources_clients.go

@@ -6727,18 +6727,16 @@ func (p ContainerPackagePaginator) NextPage(ctx context.Context) ([]ContainerPac
 }
 
 var listContainerPackageFilters = map[string]string{
-	"created_at":       "Description.CreatedAt",
-	"digest":           "Description.Digest",
-	"html_url":         "Description.HTMLURL",
-	"id":               "Description.ID",
-	"manifest":         "Description.Manifest",
-	"media_type":       "Description.MediaType",
-	"metadata":         "Description.Metadata",
-	"name":             "Description.Name",
-	"package_html_url": "Description.PackageHTMLURL",
-	"package_uri":      "Description.PackageURI",
-	"total_size":       "Description.TotalSize",
-	"updated_at":       "Description.UpdatedAt",
+	"created_at":  "Description.CreatedAt",
+	"digest":      "Description.Digest",
+	"id":          "Description.ID",
+	"manifest":    "Description.Manifest",
+	"media_type":  "Description.MediaType",
+	"metadata":    "Description.Metadata",
+	"name":        "Description.Name",
+	"package_url": "Description.PackageUrl",
+	"total_size":  "Description.TotalSize",
+	"updated_at":  "Description.UpdatedAt",
 }
 
 func ListContainerPackage(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -6802,18 +6800,16 @@ func ListContainerPackage(ctx context.Context, d *plugin.QueryData, _ *plugin.Hy
 }
 
 var getContainerPackageFilters = map[string]string{
-	"created_at":       "Description.CreatedAt",
-	"digest":           "Description.Digest",
-	"html_url":         "Description.HTMLURL",
-	"id":               "Description.ID",
-	"manifest":         "Description.Manifest",
-	"media_type":       "Description.MediaType",
-	"metadata":         "Description.Metadata",
-	"name":             "Description.Name",
-	"package_html_url": "Description.PackageHTMLURL",
-	"package_uri":      "Description.PackageURI",
-	"total_size":       "Description.TotalSize",
-	"updated_at":       "Description.UpdatedAt",
+	"created_at":  "Description.CreatedAt",
+	"digest":      "Description.Digest",
+	"id":          "Description.ID",
+	"manifest":    "Description.Manifest",
+	"media_type":  "Description.MediaType",
+	"metadata":    "Description.Metadata",
+	"name":        "Description.Name",
+	"package_url": "Description.PackageUrl",
+	"total_size":  "Description.TotalSize",
+	"updated_at":  "Description.UpdatedAt",
 }
 
 func GetContainerPackage(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {

provider/describer/container_package.go

@@ -205,7 +205,7 @@ func deduplicateVersionOutputsByDigest(resources []models.Resource, versionID in
 
 		// If we already have this digest, append to AdditionalPackageURIs
 		if existing, exists := dedupMap[dk]; exists {
-			existing.AdditionalPackageURIs = append(existing.AdditionalPackageURIs, cpd.PackageURI)
+			existing.AdditionalPackageURIs = append(existing.AdditionalPackageURIs, cpd.PackageURL)
 		} else {
 			dedupMap[dk] = &cpd
 		}
@@ -300,13 +300,10 @@ func fetchAndAssembleOutput(
 	ov := model.ContainerPackageDescription{
 		ID:                    version.ID,
 		Digest:                actualDigest, // store the real Docker digest
-		GHVersionName:         version.Name, // store the GH "version.Name" if desired
-		PackageURI:            imageRef,
 		AdditionalPackageURIs: []string{}, // Will be appended after dedup
-		PackageHTMLURL:        version.PackageHTMLURL,
 		CreatedAt:             version.CreatedAt,
 		UpdatedAt:             version.UpdatedAt,
-		HTMLURL:               version.HTMLURL,
+		PackageURL:               version.HTMLURL,
 		Name:                  imageRef,
 		MediaType:             string(desc.Descriptor.MediaType),
 		TotalSize:             totalSize,

provider/model/model.go

@@ -1462,13 +1462,11 @@ type ContainerMetadata struct {
 
 type ContainerPackageDescription struct {
 	ID             int               
-	Digest         string            
-	PackageURI     string            
-	PackageHTMLURL string            
+	Digest         string                   
 	CreatedAt      string            
 	UpdatedAt      string            
-	HTMLURL        string            
-	Name           string            
+	PackageURL        string            
+	Name           string           
 	MediaType      string            
 	TotalSize      int64             
 	Metadata       ContainerMetadata 
@@ -1478,7 +1476,6 @@ type ContainerPackageDescription struct {
 
 	// The GitHub "version.Name" or tag,
 	// if you want to store that separately from the real Docker digest.
-	GHVersionName string `json:"gh_version_name,omitempty"`
 
 	// When deduplicating, any subsequent tags for the same (ID,digest)
 	// can be appended here.

steampipe-plugin-github/github/table_github_container_package.go

@@ -28,16 +28,6 @@ func tableGitHubContainerPackage() *plugin.Table {
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.Digest"),
 				Description: "Digest of the package."},
-			{
-				Name:        "package_uri",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.PackageURI"),
-				Description: "URI of the package."},
-			{
-				Name:        "package_html_url",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.PackageHTMLURL"),
-				Description: "HTML URL of the package."},
 			{
 				Name:        "created_at",
 				Type:        proto.ColumnType_STRING,
@@ -49,9 +39,9 @@ func tableGitHubContainerPackage() *plugin.Table {
 				Transform:   transform.FromField("Description.UpdatedAt"),
 				Description: "Timestamp when the package was last updated."},
 			{
-				Name:        "html_url",
+				Name:        "package_url",
 				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.HTMLURL"),
+				Transform:   transform.FromField("Description.PackageUrl"),
 				Description: "HTML URL for the package."},
 			{
 				Name:        "name",