Skip to content

Commit ae4a3d5

Browse files
dazumadazuma
authored
Strip out old openapi conversion and swagger invocation (googleapis#3881)
1 parent edfb09e commit ae4a3d5

37 files changed

Lines changed: 4 additions & 1150 deletions

‎.kokoro/build.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ set -eo pipefail
1717

1818
pushd $(dirname "$0")/..
1919

20-
npm install
2120
mkdir .cache
2221
export TEMPDIR=$(pwd)/.cache
2322
export TEMPLATE=gax
@@ -36,7 +35,7 @@ popd
3635

3736
# create the test client
3837
if [ "${TEST_GENERATOR}" == "true" ]; then
39-
mix do google_apis.convert TestClient, google_apis.build TestClient
38+
mix google_apis.build TestClient
4039
pushd clients/test_client
4140
mix deps.get
4241
mix test

‎.kokoro/dialyzer.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ set -eo pipefail
1717

1818
pushd $(dirname "$0")/..
1919

20-
npm install
2120
mkdir .cache
2221
export TEMPDIR=$(pwd)/.cache
2322
export TEMPLATE=gax
@@ -30,7 +29,7 @@ popd
3029

3130
# create the test client
3231
mix deps.get
33-
mix do google_apis.convert TestClient, google_apis.build TestClient
32+
mix google_apis.build TestClient
3433

3534
pushd clients/test_client
3635
mix deps.get

‎config/config.exs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ use Mix.Config
3030
# import_config "#{Mix.env}.exs"
3131

3232
config :google_apis,
33-
spec_converter: GoogleApis.Converter.ApiSpecConverter,
3433
hex_api_key: System.get_env("HEX_API_KEY") || "invalidkey",
3534
client_generator: GoogleApis.Generator.ElixirGenerator,
36-
swagger_cli_image: "swaggerapi/swagger-codegen-cli:v2.3.1",
3735
oauth_client: System.get_env("GOOGLE_CLIENT_ID"),
3836
oauth_secret: System.get_env("GOOGLE_CLIENT_SECRET"),
3937
template: System.get_env("TEMPLATE") || "gax",

‎lib/google_apis.ex‎

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

1515
defmodule GoogleApis do
1616
@moduledoc """
17-
This module contains helper functions for downloading, fetching, converting
17+
This module contains helper functions for downloading and fetching
1818
API specifications and generating clients from the specifications.
1919
"""
2020

@@ -33,19 +33,6 @@ defmodule GoogleApis do
3333
end
3434
end
3535

36-
def convert_spec(api_config = %ApiConfig{}) do
37-
converter = Application.get_env(:google_apis, :spec_converter)
38-
converter.convert(api_config)
39-
end
40-
41-
def generate_config(api_config) do
42-
file = ApiConfig.config_file(api_config)
43-
swagger_config = GoogleApis.SwaggerConfig.from_api_config(api_config)
44-
45-
file |> Path.dirname() |> File.mkdir_p()
46-
File.write(file, Poison.encode!(swagger_config, pretty: true))
47-
end
48-
4936
def generate_client(api_config) do
5037
generator = Application.get_env(:google_apis, :client_generator)
5138
generator.generate_client(api_config)

‎lib/google_apis/converter.ex‎

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

‎lib/google_apis/converter/api_spec_converter.ex‎

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

‎lib/google_apis/generator/swagger_cli.ex‎

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

‎lib/google_apis/swagger_config.ex‎

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

‎lib/mix/tasks/google_apis.build.ex‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ defmodule Mix.Tasks.GoogleApis.Build do
3232
end
3333

3434
def build(api) do
35-
GoogleApis.generate_config(api)
3635
GoogleApis.generate_client(api)
3736
end
3837
end

‎lib/mix/tasks/google_apis.convert.ex‎

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

0 commit comments

Comments
 (0)