Skip to content

Commit 8926a9a

Browse files
authored
release: move pkg:functions_framework to pkg:google_cloud (#429)
Delete pkg:gcp source
1 parent 973949e commit 8926a9a

22 files changed

+24
-342
lines changed

.github/workflows/lint.yml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ jobs:
3939
- name: mono_repo self validate
4040
run: dart pub global run mono_repo generate --validate
4141
job_002:
42-
name: "analyze_format; Dart 3.0.0; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, gcp, google_cloud; `dart analyze`"
42+
name: "analyze_format; Dart 3.0.0; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, google_cloud; `dart analyze`"
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Cache Pub hosted dependencies
4646
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
4747
with:
4848
path: "~/.pub-cache/hosted"
49-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-gcp-google_cloud;commands:analyze_1"
49+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud;commands:analyze_1"
5050
restore-keys: |
51-
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-gcp-google_cloud
51+
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud
5252
os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
5353
os:ubuntu-latest;pub-cache-hosted
5454
os:ubuntu-latest
@@ -167,15 +167,6 @@ jobs:
167167
run: dart analyze
168168
if: "always() && steps.functions_framework_builder_pub_upgrade.conclusion == 'success'"
169169
working-directory: functions_framework_builder
170-
- id: gcp_pub_upgrade
171-
name: gcp; dart pub upgrade
172-
run: dart pub upgrade
173-
if: "always() && steps.checkout.conclusion == 'success'"
174-
working-directory: gcp
175-
- name: gcp; dart analyze
176-
run: dart analyze
177-
if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'"
178-
working-directory: gcp
179170
- id: google_cloud_pub_upgrade
180171
name: google_cloud; dart pub upgrade
181172
run: dart pub upgrade
@@ -186,16 +177,16 @@ jobs:
186177
if: "always() && steps.google_cloud_pub_upgrade.conclusion == 'success'"
187178
working-directory: google_cloud
188179
job_003:
189-
name: "analyze_format; Dart dev; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, gcp, google_cloud, integration_test; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
180+
name: "analyze_format; Dart dev; PKGS: dartfn, dartfn/templates/cloudevent, dartfn/templates/helloworld, dartfn/templates/json, examples/fullstack/backend, examples/fullstack/frontend-cli, examples/hello, examples/json, examples/protobuf_firestore, examples/raw_cloudevent, functions_framework, functions_framework_builder, google_cloud, integration_test; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`"
190181
runs-on: ubuntu-latest
191182
steps:
192183
- name: Cache Pub hosted dependencies
193184
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
194185
with:
195186
path: "~/.pub-cache/hosted"
196-
key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-gcp-google_cloud-integration_test;commands:format-analyze_0"
187+
key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud-integration_test;commands:format-analyze_0"
197188
restore-keys: |
198-
os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-gcp-google_cloud-integration_test
189+
os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dartfn-dartfn/templates/cloudevent-dartfn/templates/helloworld-dartfn/templates/json-examples/fullstack/backend-examples/fullstack/frontend-cli-examples/hello-examples/json-examples/protobuf_firestore-examples/raw_cloudevent-functions_framework-functions_framework_builder-google_cloud-integration_test
199190
os:ubuntu-latest;pub-cache-hosted;sdk:dev
200191
os:ubuntu-latest;pub-cache-hosted
201192
os:ubuntu-latest
@@ -362,19 +353,6 @@ jobs:
362353
run: dart analyze --fatal-infos
363354
if: "always() && steps.functions_framework_builder_pub_upgrade.conclusion == 'success'"
364355
working-directory: functions_framework_builder
365-
- id: gcp_pub_upgrade
366-
name: gcp; dart pub upgrade
367-
run: dart pub upgrade
368-
if: "always() && steps.checkout.conclusion == 'success'"
369-
working-directory: gcp
370-
- name: "gcp; dart format --output=none --set-exit-if-changed ."
371-
run: "dart format --output=none --set-exit-if-changed ."
372-
if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'"
373-
working-directory: gcp
374-
- name: "gcp; dart analyze --fatal-infos"
375-
run: dart analyze --fatal-infos
376-
if: "always() && steps.gcp_pub_upgrade.conclusion == 'success'"
377-
working-directory: gcp
378356
- id: google_cloud_pub_upgrade
379357
name: google_cloud; dart pub upgrade
380358
run: dart pub upgrade

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM dart:stable AS build
66
WORKDIR /app
77
COPY ./functions_framework/pubspec.yaml /app/functions_framework/
88
COPY ./functions_framework_builder/pubspec.yaml /app/functions_framework_builder/
9-
COPY ./gcp/pubspec.yaml /app/gcp/
9+
COPY ./google_cloud/pubspec.yaml /app/google_cloud/
1010
COPY ./integration_test/pubspec.yaml /app/integration_test/
1111

1212
WORKDIR /app/integration_test

docs/quickstarts/03-quickstart-cloudrun.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ the [Manage resources] page.
125125
[codelab]: https://codelabs.developers.google.com/codelabs/cloud-shell
126126
[delete the image]: https://cloud.google.com/container-registry/docs/managing#deleting_images
127127
[gcloud]: https://cloud.google.com/sdk/docs/install
128-
[Google Cloud]: https://cloud.google.com/gcp
128+
[Google Cloud]: https://cloud.google.com/
129129
[incur charges]: https://cloud.google.com/container-registry/pricing
130130
[Installing and using dartfn]: 00-install-dartfn.md
131131
[Manage resources]: https://console.cloud.google.com/iam-admin/projects

functions_framework/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.3+1
2+
3+
- Migrate from `package:gcp` to `package:google_cloud`.
4+
15
## 0.4.3
26

37
- Support `application/protobuf` event encoding.

functions_framework/lib/functions_framework.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/// ```
2525
library functions_framework;
2626

27-
export 'package:gcp/gcp.dart'
27+
export 'package:google_cloud/google_cloud.dart'
2828
show BadRequestException, LogSeverity, RequestLogger;
2929

3030
export 'src/cloud_event.dart' show CloudEvent;

functions_framework/lib/serve.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ library serve;
2525
import 'dart:async';
2626
import 'dart:io';
2727

28-
import 'package:gcp/gcp.dart';
28+
import 'package:google_cloud/google_cloud.dart';
2929
import 'package:io/ansi.dart';
3030
import 'package:io/io.dart';
3131

3232
import 'src/function_config.dart';
3333
import 'src/function_target.dart';
3434
import 'src/run.dart';
3535

36-
export 'package:gcp/gcp.dart' show BadRequestException;
36+
export 'package:google_cloud/google_cloud.dart' show BadRequestException;
3737

3838
export 'src/function_target.dart'
3939
show FunctionTarget, JsonFunctionTarget, JsonWithContextFunctionTarget;
@@ -92,7 +92,7 @@ Future<void> _serve(
9292
try {
9393
projectId = await projectIdFromMetadataServer();
9494
} on BadConfigurationException {
95-
// NOOP! - we aren't on GCP, so use normal logging
95+
// NOOP! - we aren't on Google Cloud, so use normal logging
9696
}
9797
final loggingMiddleware = createLoggingMiddleware(projectId: projectId);
9898

functions_framework/lib/src/function_config.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import 'dart:io';
1616

1717
import 'package:args/args.dart';
18-
import 'package:gcp/gcp.dart';
18+
import 'package:google_cloud/google_cloud.dart';
1919

2020
const defaultFunctionType = FunctionType.http;
2121
const defaultFunctionTarget = 'function';

functions_framework/lib/src/json_request_utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import 'dart:convert';
1616
import 'dart:typed_data';
1717

18-
import 'package:gcp/gcp.dart';
18+
import 'package:google_cloud/google_cloud.dart';
1919
import 'package:http_parser/http_parser.dart';
2020
import 'package:shelf/shelf.dart';
2121

functions_framework/lib/src/request_context.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import 'package:gcp/gcp.dart';
15+
import 'package:google_cloud/google_cloud.dart';
1616
import 'package:meta/meta.dart';
1717
import 'package:shelf/shelf.dart';
1818

functions_framework/lib/src/targets/cloud_event_targets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:gcp/gcp.dart';
17+
import 'package:google_cloud/google_cloud.dart';
1818
import 'package:shelf/shelf.dart';
1919

2020
import '../cloud_event.dart';

functions_framework/lib/src/targets/http_targets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:gcp/gcp.dart';
17+
import 'package:google_cloud/google_cloud.dart';
1818
import 'package:shelf/shelf.dart';
1919

2020
import '../function_target.dart';

functions_framework/lib/src/typedefs.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import 'dart:async';
1616

17-
import 'package:gcp/gcp.dart';
17+
import 'package:google_cloud/google_cloud.dart';
1818
import 'package:shelf/shelf.dart';
1919

2020
import 'cloud_event.dart';

functions_framework/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: functions_framework
2-
version: 0.4.3
2+
version: 0.4.3+1
33
description: >-
44
FaaS (Function as a service) framework for writing portable Dart functions
55
repository: https://github.com/GoogleCloudPlatform/functions-framework-dart
@@ -10,7 +10,7 @@ environment:
1010
dependencies:
1111
args: ^2.0.0
1212
collection: ^1.15.0
13-
gcp: ^0.1.0
13+
google_cloud: ^0.2.0
1414
http: '>=0.13.0 <2.0.0'
1515
http_parser: ^4.0.0
1616
io: ^1.0.0

gcp/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

gcp/CHANGELOG.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

gcp/Dockerfile

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)