Skip to content

Commit

Permalink
Recompile plugin with steampipe-plugin-sdk v5.10.1 and add support fo…
Browse files Browse the repository at this point in the history
…r connection key columns (#38)



Co-authored-by: ParthaI <partha@turbot.com>
  • Loading branch information
misraved and ParthaI committed Jun 19, 2024
1 parent 9877bc0 commit ad173af
Show file tree
Hide file tree
Showing 10 changed files with 225 additions and 151 deletions.
54 changes: 54 additions & 0 deletions buildkite/common_columns.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package buildkite

import (
"context"

"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
"github.com/turbot/steampipe-plugin-sdk/v5/memoize"
"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
)

func commonColumns(c []*plugin.Column) []*plugin.Column {
return append([]*plugin.Column{
{
Name: "member_id",
Description: "Unique identifier for the organization.",
Type: proto.ColumnType_STRING,
Hydrate: getMemberId,
Transform: transform.FromValue(),
},
}, c...)
}

// if the caching is required other than per connection, build a cache key for the call and use it in Memoize.
var getMemberIdMemoized = plugin.HydrateFunc(getMemberIdUncached).Memoize(memoize.WithCacheKeyFunction(getMemberIdCacheKey))

// declare a wrapper hydrate function to call the memoized function
// - this is required when a memoized function is used for a column definition
func getMemberId(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
return getMemberIdMemoized(ctx, d, h)
}

// Build a cache key for the call to getMemberIdCacheKey.
func getMemberIdCacheKey(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
key := "getMemberId"
return key, nil
}

func getMemberIdUncached(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {

conn, err := connect(ctx, d)
if err != nil {
plugin.Logger(ctx).Error("getMemberIdUncached", "connection_error", err)
return nil, err
}

user, resp, err := conn.User.Get()
if err != nil {
plugin.Logger(ctx).Error("getMemberIdUncached", "query_error", err, "resp", resp)
return nil, err
}

return user.ID, nil
}
10 changes: 9 additions & 1 deletion buildkite/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@ func Plugin(ctx context.Context) *plugin.Plugin {
NewInstance: ConfigInstance,
},
DefaultTransform: transform.FromJSONTag().NullIfZero(),
// User ID against which the access token has generated. (This is unique per connection)
// User can have access to multiple Organizations so org ID can not be include as connection key quals.
ConnectionKeyColumns: []plugin.ConnectionKeyColumn{
{
Name: "member_id",
Hydrate: getMemberId,
},
},
DefaultGetConfig: &plugin.GetConfig{
ShouldIgnoreError: isNotFoundError,
},
TableMap: map[string]*plugin.Table{
"buildkite_agent": tableBuildkiteAgent(ctx),
"buildkite_agent": tableBuildkiteAgent(ctx),
"buildkite_build": tableBuildkiteBuild(ctx),
"buildkite_organization": tableBuildkiteOrganization(ctx),
"buildkite_pipeline": tableBuildkitePipeline(ctx),
Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func tableBuildkiteAgent(ctx context.Context) *plugin.Table {
{Name: "id"},
},
},
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "organization_slug", Type: proto.ColumnType_STRING, Transform: transform.FromField("URL").Transform(orgFromURL), Description: "Organization of the agent."},
{Name: "id", Type: proto.ColumnType_STRING, Description: "ID of the agent."},
Expand All @@ -51,7 +51,7 @@ func tableBuildkiteAgent(ctx context.Context) *plugin.Table {
{Name: "user_agent", Type: proto.ColumnType_STRING, Description: "User agent of the agent."},
{Name: "version", Type: proto.ColumnType_STRING, Description: "Version of the agent."},
{Name: "web_url", Type: proto.ColumnType_STRING, Description: "Web URL for the agent."},
},
}),
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func tableBuildkiteBuild(ctx context.Context) *plugin.Table {
},
},
*/
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "organization_slug", Type: proto.ColumnType_STRING, Transform: transform.FromField("URL").Transform(orgFromURL), Description: "Organization of the build."},
{Name: "pipeline_slug", Type: proto.ColumnType_STRING, Transform: transform.FromField("Pipeline.Slug"), Description: "Slug of the pipeline the build is for."},
Expand All @@ -60,7 +60,7 @@ func tableBuildkiteBuild(ctx context.Context) *plugin.Table {
{Name: "started_at", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("StartedAt").Transform(timeToRfc3339), Description: "Time when the build was started."},
{Name: "url", Type: proto.ColumnType_STRING, Description: "URL for the build."},
{Name: "web_url", Type: proto.ColumnType_STRING, Description: "Web URL for the build."},
},
}),
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func tableBuildkiteOrganization(ctx context.Context) *plugin.Table {
{Name: "slug"},
},
},
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "slug", Type: proto.ColumnType_STRING, Description: "Slug of the organization."},
{Name: "name", Type: proto.ColumnType_STRING, Description: "Name of the organization."},
Expand All @@ -37,7 +37,7 @@ func tableBuildkiteOrganization(ctx context.Context) *plugin.Table {
{Name: "repository", Type: proto.ColumnType_STRING, Description: "Repository for the organization."},
{Name: "url", Type: proto.ColumnType_STRING, Description: "URL for the organization."},
{Name: "web_url", Type: proto.ColumnType_STRING, Description: "Web URL for the organization."},
},
}),
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func tableBuildkitePipeline(ctx context.Context) *plugin.Table {
{Name: "slug"},
},
},
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "slug", Type: proto.ColumnType_STRING, Description: "Slug of the pipeline."},
{Name: "name", Type: proto.ColumnType_STRING, Description: "Name of the pipeline."},
Expand Down Expand Up @@ -60,7 +60,7 @@ func tableBuildkitePipeline(ctx context.Context) *plugin.Table {
{Name: "visibility", Type: proto.ColumnType_STRING, Description: "Visibility of the pipeline."},
{Name: "waiting_jobs_count", Type: proto.ColumnType_INT, Transform: transform.FromField("WaitingJobsCount"), Description: "Number of waiting jobs."},
{Name: "web_url", Type: proto.ColumnType_STRING, Description: "Web URL for the pipeline."},
},
}),
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_team.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func tableBuildkiteTeam(ctx context.Context) *plugin.Table {
ParentHydrate: listOrganization,
Hydrate: listTeam,
},
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "organization_slug", Type: proto.ColumnType_STRING, Description: "Organization slug for the team."},
{Name: "slug", Type: proto.ColumnType_STRING, Transform: transform.FromField("Team.Slug"), Description: "Slug of the team."},
Expand All @@ -30,7 +30,7 @@ func tableBuildkiteTeam(ctx context.Context) *plugin.Table {
{Name: "default", Type: proto.ColumnType_BOOL, Transform: transform.FromField("Team.Default"), Description: "True if this is the default team."},
{Name: "created_at", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("Team.CreatedAt").Transform(timeToRfc3339), Description: "Time when the team was created."},
{Name: "created_by", Type: proto.ColumnType_JSON, Transform: transform.FromField("Team.CreatedBy"), Description: "User who created the team."},
},
}),
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildkite/table_buildkite_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ func tableBuildkiteUser(ctx context.Context) *plugin.Table {
List: &plugin.ListConfig{
Hydrate: listUser,
},
Columns: []*plugin.Column{
Columns: commonColumns([]*plugin.Column{
// Top columns
{Name: "id", Type: proto.ColumnType_STRING, Description: "ID of the user."},
{Name: "name", Type: proto.ColumnType_STRING, Description: "Name of the user."},
{Name: "email", Type: proto.ColumnType_STRING, Description: "Email of the user."},
{Name: "created_at", Type: proto.ColumnType_TIMESTAMP, Transform: transform.FromField("CreatedAt").Transform(timeToRfc3339), Description: "Time when the user was created."},
{Name: "access_token_uuid", Type: proto.ColumnType_STRING, Hydrate: getAccessToken, Transform: transform.FromField("UUID"), Description: "UUID of the access token for these credentials."},
{Name: "scopes", Type: proto.ColumnType_JSON, Hydrate: getAccessToken, Description: "Scopes assigned to the access token for this user."},
},
}),
}
}

Expand Down
94 changes: 50 additions & 44 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
module github.com/turbot/steampipe-plugin-buildkite

go 1.21
go 1.21.0

toolchain go1.21.1

require (
github.com/buildkite/go-buildkite/v3 v3.0.1
github.com/turbot/go-kit v0.9.0-rc.1
github.com/turbot/steampipe-plugin-sdk/v5 v5.8.0
github.com/turbot/go-kit v0.10.0-rc.0
github.com/turbot/steampipe-plugin-sdk/v5 v5.10.1
)

require (
cloud.google.com/go v0.110.7 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/allegro/bigcache/v3 v3.1.0 // indirect
Expand All @@ -23,7 +25,7 @@ require (
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/btubbs/datetime v0.1.1 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
Expand All @@ -32,29 +34,30 @@ require (
github.com/eko/gocache/store/bigcache/v4 v4.2.1 // indirect
github.com/eko/gocache/store/ristretto/v4 v4.2.1 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gertd/go-pluralize v0.2.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.3 // indirect
github.com/hashicorp/go-hclog v1.6.1 // indirect
github.com/hashicorp/go-getter v1.7.4 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -79,32 +82,35 @@ require (
github.com/stevenle/topsort v0.2.0 // indirect
github.com/tkrajina/go-reflector v0.5.6 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/tools v0.6.0 // indirect
google.golang.org/api v0.162.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit ad173af

Please sign in to comment.