Merge pull request #15 from opengovern/fix_dockerfile

fix: deleted some columns from artifact_dockerfile

Author: mohamadch91

pkg/sdk/es/resources_clients.go

@@ -7346,17 +7346,13 @@ func (p ArtifactDockerFilePaginator) NextPage(ctx context.Context) ([]ArtifactDo
 }
 
 var listArtifactDockerFileFilters = map[string]string{
-	"dockerfile_content":        "Description.DockerfileContent",
-	"dockerfile_content_base64": "Description.DockerfileContentBase64",
-	"git_url":                   "Description.GitURL",
-	"html_url":                  "Description.HTMLURL",
-	"images":                    "Description.Images",
-	"last_updated_at":           "Description.LastUpdatedAt",
-	"name":                      "Description.Name",
-	"path":                      "Description.Path",
-	"repository":                "Description.Repository",
-	"sha":                       "Description.Sha",
-	"uri":                       "Description.URI",
+	"dockerfile_content": "Description.DockerfileContent",
+	"html_url":           "Description.HTMLURL",
+	"images":             "Description.Images",
+	"last_updated_at":    "Description.LastUpdatedAt",
+	"name":               "Description.Name",
+	"repository":         "Description.Repository",
+	"sha":                "Description.Sha",
 }
 
 func ListArtifactDockerFile(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -7420,17 +7416,13 @@ func ListArtifactDockerFile(ctx context.Context, d *plugin.QueryData, _ *plugin.
 }
 
 var getArtifactDockerFileFilters = map[string]string{
-	"dockerfile_content":        "Description.DockerfileContent",
-	"dockerfile_content_base64": "Description.DockerfileContentBase64",
-	"git_url":                   "Description.GitURL",
-	"html_url":                  "Description.HTMLURL",
-	"images":                    "Description.Images",
-	"last_updated_at":           "Description.LastUpdatedAt",
-	"name":                      "Description.Name",
-	"path":                      "Description.Path",
-	"repository":                "Description.Repository",
-	"sha":                       "Description.Sha",
-	"uri":                       "Description.URI",
+	"dockerfile_content": "Description.DockerfileContent",
+	"html_url":           "Description.HTMLURL",
+	"images":             "Description.Images",
+	"last_updated_at":    "Description.LastUpdatedAt",
+	"name":               "Description.Name",
+	"repository":         "Description.Repository",
+	"sha":                "Description.Sha",
 }
 
 func GetArtifactDockerFile(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {

provider/describer/artifact_dockerfile.go

@@ -219,21 +219,21 @@ func GetDockerfile(
 	}
 
 	output := model.ArtifactDockerFileDescription{
-		Sha:                     &contentData.Sha,
-		Name:                    &contentData.Name,
-		Path:                    &contentData.Path,
-		LastUpdatedAt:           &lastUpdatedAt,
-		GitURL:                  &contentData.GitURL,
-		HTMLURL:                 &contentData.HTMLURL,
-		URI:                     &contentData.HTMLURL,
+		Sha:  &contentData.Sha,
+		Name: &contentData.Name,
+		//Path:                    &contentData.Path,
+		LastUpdatedAt: &lastUpdatedAt,
+		//GitURL:                  &contentData.GitURL,
+		HTMLURL: &contentData.HTMLURL,
+		//URI:                     &contentData.HTMLURL,
 		DockerfileContent:       string(decoded),
 		DockerfileContentBase64: &dockerfileB64,
 		Repository:              repoObj,
 		Images:                  images,
 	}
 
 	value := models.Resource{
-		ID:          *output.URI,
+		ID:          contentData.HTMLURL,
 		Name:        *output.Name,
 		Description: output,
 	}

provider/model/model.go

@@ -1456,21 +1456,21 @@ type Package struct {
 
 type ContainerMetadata struct {
 	Container struct {
-		Tags []string 
-	} 
+		Tags []string
+	}
 }
 
 type ContainerPackageDescription struct {
-	ID             int               
-	Digest         string                   
-	CreatedAt      string            
-	UpdatedAt      string            
-	PackageURL       string            
-	Name           string           
-	MediaType      string            
-	TotalSize      int64             
-	Metadata       ContainerMetadata 
-	Manifest       interface{}       
+	ID         int
+	Digest     string
+	CreatedAt  string
+	UpdatedAt  string
+	PackageURL string
+	Name       string
+	MediaType  string
+	TotalSize  int64
+	Metadata   ContainerMetadata
+	Manifest   interface{}
 
 	// -- Add these new fields/methods: --
 
@@ -1637,13 +1637,13 @@ type CommitResponse struct {
 }
 
 type ArtifactDockerFileDescription struct {
-	Sha                     *string
-	Name                    *string
-	Path                    *string
-	LastUpdatedAt           *string
-	GitURL                  *string
-	HTMLURL                 *string
-	URI                     *string // Unique identifier
+	Sha  *string
+	Name *string
+	//Path                    *string
+	LastUpdatedAt *string
+	//GitURL                  *string
+	HTMLURL *string
+	//URI                     *string // Unique identifier
 	DockerfileContent       string
 	DockerfileContentBase64 *string
 	Repository              map[string]interface{}

steampipe-plugin-github/github/table_github_artifact_dockerfile.go

@@ -29,41 +29,41 @@ func tableGitHubArtifactDockerFile() *plugin.Table {
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.Name"),
 				Description: "Name of the Dockerfile."},
-			{
-				Name:        "path",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Path"),
-				Description: "Path to the Dockerfile in the repository."},
+			//{
+			//	Name:        "path",
+			//	Type:        proto.ColumnType_STRING,
+			//	Transform:   transform.FromField("Description.Path"),
+			//	Description: "Path to the Dockerfile in the repository."},
 			{
 				Name:        "last_updated_at",
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.LastUpdatedAt"),
 				Description: "Last time the dockerfile updated"},
-			{
-				Name:        "git_url",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.GitURL"),
-				Description: "Git URL where the Dockerfile can be accessed."},
+			//{
+			//	Name:        "git_url",
+			//	Type:        proto.ColumnType_STRING,
+			//	Transform:   transform.FromField("Description.GitURL"),
+			//	Description: "Git URL where the Dockerfile can be accessed."},
 			{
 				Name:        "html_url",
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.HTMLURL"),
 				Description: "HTML URL where the Dockerfile can be accessed."},
-			{
-				Name:        "uri",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.URI"),
-				Description: "Unique URI for the Dockerfile."},
+			//{
+			//	Name:        "uri",
+			//	Type:        proto.ColumnType_STRING,
+			//	Transform:   transform.FromField("Description.URI"),
+			//	Description: "Unique URI for the Dockerfile."},
 			{
 				Name:        "dockerfile_content",
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.DockerfileContent"),
 				Description: "Dockerfile content."},
-			{
-				Name:        "dockerfile_content_base64",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.DockerfileContentBase64"),
-				Description: "Dockerfile content base64."},
+			//{
+			//	Name:        "dockerfile_content_base64",
+			//	Type:        proto.ColumnType_STRING,
+			//	Transform:   transform.FromField("Description.DockerfileContentBase64"),
+			//	Description: "Dockerfile content base64."},
 			{
 				Name:        "repository",
 				Type:        proto.ColumnType_JSON,