Unverified Commit bb6be0ba authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #261259 from totoroot/google-cloud-bigtable-tool-0.12.0

parents ed99fa27 0365ed6a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@
- Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`;
  see [#221181](https://github.com/NixOS/nixpkgs/issues/221181).

- Package `cloud-sql-proxy` was renamed to `google-cloud-sql-proxy` as it cannot be used with other cloud providers.;

- Package `pash` was removed due to being archived upstream. Use `powershell` as an alternative.

- `security.sudo.extraRules` now includes `root`'s default rule, with ordering
+37 −0
Original line number Diff line number Diff line
{ lib
, buildGoModule
, fetchFromGitHub
}:

buildGoModule rec {
  pname = "google-cloud-bigtable-tool";
  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "googleapis";
    repo = "cloud-bigtable-cbt-cli";
    rev = "v.${version}";
    hash = "sha256-N5nbWMj7kLIdRiwBUWFz4Rat88Wx01i3hceMxAvSjaA=";
  };

  vendorHash = "sha256-kwvEfvHs6XF84bB3Ss1307OjId0nh/0Imih1fRFdY0M=";

  preCheck = ''
    buildFlagsArray+="-short"
  '';

  meta = with lib; {
    description = "Google Cloud Bigtable Tool";
    longDescription = ''
      `cbt` is the Google Cloud Bigtable Tool. A CLI utility to interact with Google Cloud Bigtable.
      The cbt CLI is a command-line interface for performing several different operations on Cloud Bigtable.
      It is written in Go using the Go client library for Cloud Bigtable.
      An overview of its usage can be found in the [Google Cloud docs](https://cloud.google.com/bigtable/docs/cbt-overview).
      For information about Bigtable in general, see the [overview of Bigtable](https://cloud.google.com/bigtable/docs/overview).
    '';
    homepage = "https://github.com/googleapis/cloud-bigtable-cbt-cli";
    license = licenses.asl20;
    maintainers = with maintainers; [ totoroot ];
    mainProgram = "cbt";
  };
}
+9 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
}:

buildGoModule rec {
  pname = "cloud-sql-proxy";
  pname = "google-cloud-sql-proxy";
  version = "2.7.0";

  src = fetchFromGitHub {
@@ -24,6 +24,14 @@ buildGoModule rec {

  meta = with lib; {
    description = "Utility for ensuring secure connections to Google Cloud SQL instances";
    longDescription = ''
      The Cloud SQL Auth Proxy is a utility for ensuring secure connections to your Cloud SQL instances.
      It provides IAM authorization, allowing you to control who can connect to your instance through IAM permissions,
      and TLS 1.3 encryption, without having to manage certificates.
      See the [Connecting Overview](https://cloud.google.com/sql/docs/mysql/connect-overview) page for more information
      on connecting to a Cloud SQL instance, or the [About the Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy)
      page for details on how the Cloud SQL Proxy works.
    '';
    homepage = "https://github.com/GoogleCloudPlatform/cloud-sql-proxy";
    license = licenses.asl20;
    maintainers = with maintainers; [ nicknovitski totoroot ];
+4 −2
Original line number Diff line number Diff line
@@ -3618,8 +3618,6 @@ with pkgs;
  clairvoyance = callPackage ../tools/security/clairvoyance { };
  cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
  cloudfox = callPackage ../tools/security/cloudfox { };
  cloudhunter = callPackage ../tools/security/cloudhunter { };
@@ -8755,6 +8753,10 @@ with pkgs;
    with-gce = true;
  };
  google-cloud-bigtable-tool = callPackage ../tools/misc/google-cloud-bigtable-tool { };
  google-cloud-sql-proxy = callPackage ../tools/misc/google-cloud-sql-proxy { };
  google-fonts = callPackage ../data/fonts/google-fonts { };
  google-clasp = callPackage ../development/tools/google-clasp { };