Skip to content

Commit 6b4ee97

Browse files
Arta AsadiArta Asadi
authored andcommitted
fix: fix resource structure for cluster role binding
1 parent c53aa43 commit 6b4ee97

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

cloudql/kubernetes/common_column.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package kubernetes
33
import (
44
"context"
55
"encoding/json"
6+
"github.com/shurcooL/githubv4"
7+
"time"
68

79
"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
810
"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
@@ -23,8 +25,8 @@ func objectMetadataColumns() []*plugin.Column {
2325
{Name: "generate_name", Type: proto.ColumnType_STRING, Transform: transform.FromField("Description.MetaObject.GenerateName"), Description: "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided."},
2426
{Name: "resource_version", Type: proto.ColumnType_STRING, Transform: transform.FromField("Description.MetaObject.ResourceVersion"), Description: "An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed."},
2527
{Name: "generation", Type: proto.ColumnType_INT, Transform: transform.FromField("Description.MetaObject.Generation"), Description: "A sequence number representing a specific generation of the desired state."},
26-
{Name: "creation_timestamp", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("Description.MetaObject.CreationTimestamp").Transform(v1TimeToRFC3339), Description: "CreationTimestamp is a timestamp representing the server time when this object was created."},
27-
{Name: "deletion_timestamp", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("Description.MetaObject.DeletionTimestamp").Transform(v1TimeToRFC3339), Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted."},
28+
//{Name: "creation_timestamp", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("Description.MetaObject.CreationTimestamp").NullIfZero(), Description: "CreationTimestamp is a timestamp representing the server time when this object was created."},
29+
//{Name: "deletion_timestamp", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("Description.MetaObject.DeletionTimestamp").NullIfZero(), Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted."},
2830
{Name: "deletion_grace_period_seconds", Type: proto.ColumnType_INT, Transform: transform.FromField("Description.MetaObject.DeletionGracePeriodSeconds"), Description: "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set."},
2931
{Name: "labels", Type: proto.ColumnType_JSON, Transform: transform.FromField("Description.MetaObject.Labels"), Description: "Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services."},
3032
{Name: "annotations", Type: proto.ColumnType_JSON, Transform: transform.FromField("Description.MetaObject.Annotations"), Description: "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata."},

discovery/provider/model_helpers.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,15 @@ type Time struct {
1818
time.Time
1919
}
2020

21-
func ConvertTime(timestamp metav1.Time) Time {
22-
return Time{
23-
timestamp.Time,
24-
}
21+
func ConvertTime(timestamp metav1.Time) time.Time {
22+
return timestamp.Time
2523
}
2624

27-
func ConvertTimePtr(timestamp *metav1.Time) *Time {
25+
func ConvertTimePtr(timestamp *metav1.Time) *time.Time {
2826
if timestamp == nil {
2927
return nil
3028
}
31-
return &Time{
32-
timestamp.Time,
33-
}
29+
return &timestamp.Time
3430
}
3531

3632
type FieldsV1 struct {
@@ -79,7 +75,7 @@ type ManagedFieldsEntry struct {
7975
Manager string
8076
Operation ManagedFieldsOperationType
8177
APIVersion string
82-
Time *Time
78+
Time *time.Time
8379
FieldsType string
8480
FieldsV1 *FieldsV1
8581
Subresource string
@@ -121,8 +117,8 @@ type ObjectMeta struct {
121117
UID types.UID
122118
ResourceVersion string
123119
Generation int64
124-
CreationTimestamp Time
125-
DeletionTimestamp *Time
120+
CreationTimestamp time.Time
121+
DeletionTimestamp *time.Time
126122
DeletionGracePeriodSeconds *int64
127123
Labels map[string]string
128124
Annotations map[string]string

0 commit comments

Comments
 (0)