Skip to content

Commit 6f4accc

Browse files
WeiQuan0605WeiQuan0605
committed
Remove fog azure support from ccng coding and Gemfile.
1 parent 6e6d356 commit 6f4accc

5 files changed

Lines changed: 6 additions & 111 deletions

File tree

‎Gemfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@ gem 'actionview', '~> 8.1.3'
4040
gem 'activemodel', '~> 8.1.2'
4141
gem 'railties', '~> 8.1.1'
4242

43-
gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby.git', branch: 'x-ms-blob-content-type-fix-1.1'
44-
4543
gem 'fog-aliyun'
4644
gem 'fog-aws'
47-
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
4845
gem 'fog-core', '~> 2.6.0'
4946
gem 'fog-google', '~> 1.29.4'
5047
gem 'fog-local'

‎Gemfile.lock‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,3 @@
1-
GIT
2-
remote: https://github.com/fog/fog-azure-rm.git
3-
revision: 379e352cce817f8e67618062bf7095095d8f5c4c
4-
branch: fog-arm-cf
5-
specs:
6-
fog-azure-rm (0.4.7)
7-
azure-storage-blob (~> 1.1)
8-
azure-storage-common (~> 1.1)
9-
azure_mgmt_compute (~> 0.9.0)
10-
azure_mgmt_dns (~> 0.9.0)
11-
azure_mgmt_key_vault (~> 0.9.0)
12-
azure_mgmt_network (~> 0.9.0)
13-
azure_mgmt_resources (~> 0.9.0)
14-
azure_mgmt_sql (~> 0.9.0)
15-
azure_mgmt_storage (~> 0.9.0)
16-
azure_mgmt_traffic_manager (~> 0.9.0)
17-
fog-core (>= 1.43)
18-
fog-json (>= 1.0.2)
19-
mime-types (~> 3.0)
20-
vhd (= 0.0.4)
21-
22-
GIT
23-
remote: https://github.com/sethboyles/azure-storage-ruby.git
24-
revision: d4737cdfcef3f3c4c2463a54690b6b73c0f6f707
25-
branch: x-ms-blob-content-type-fix-1.1
26-
specs:
27-
azure-storage-blob (1.1.0)
28-
azure-core (~> 0.1.13)
29-
azure-storage-common (~> 1.0)
30-
nokogiri (~> 1.6, >= 1.6.8)
31-
azure-storage-common (1.1.0)
32-
azure-core (~> 0.1.13)
33-
nokogiri (~> 1.6, >= 1.6.8)
34-
351
GEM
362
remote: https://rubygems.org/
373
specs:
@@ -72,31 +38,10 @@ GEM
7238
nokogiri (~> 1.6)
7339
rest-client (~> 2.0)
7440
ast (2.4.3)
75-
azure-core (0.1.15)
76-
faraday (~> 0.9)
77-
faraday_middleware (~> 0.10)
78-
nokogiri (~> 1.6)
79-
azure_mgmt_compute (0.9.0)
80-
ms_rest_azure (~> 0.7.0)
81-
azure_mgmt_dns (0.9.0)
82-
ms_rest_azure (~> 0.7.0)
83-
azure_mgmt_key_vault (0.9.0)
84-
ms_rest_azure (~> 0.7.0)
85-
azure_mgmt_network (0.9.0)
86-
ms_rest_azure (~> 0.7.0)
87-
azure_mgmt_resources (0.9.0)
88-
ms_rest_azure (~> 0.7.0)
89-
azure_mgmt_sql (0.9.0)
90-
ms_rest_azure (~> 0.7.0)
91-
azure_mgmt_storage (0.9.0)
92-
ms_rest_azure (~> 0.7.0)
93-
azure_mgmt_traffic_manager (0.9.0)
94-
ms_rest_azure (~> 0.7.0)
9541
backport (1.2.0)
9642
base64 (0.3.0)
9743
benchmark (0.5.0)
9844
bigdecimal (4.1.2)
99-
bit-struct (0.17)
10045
bootsnap (1.24.4)
10146
msgpack (~> 1.2)
10247
builder (3.3.0)
@@ -141,11 +86,6 @@ GEM
14186
logger
14287
faraday (0.17.6)
14388
multipart-post (>= 1.2, < 3)
144-
faraday-cookie_jar (0.0.8)
145-
faraday (>= 0.8.0)
146-
http-cookie (>= 1.0.0)
147-
faraday_middleware (0.14.0)
148-
faraday (>= 0.7.4, < 1.0)
14989
ffi (1.17.4)
15090
ffi (1.17.4-x86_64-darwin)
15191
ffi (1.17.4-x86_64-linux-gnu)
@@ -299,15 +239,6 @@ GEM
299239
prism (~> 1.5)
300240
mock_redis (0.54.0)
301241
redis (~> 5)
302-
ms_rest (0.6.4)
303-
concurrent-ruby (~> 1.0)
304-
faraday (~> 0.9)
305-
timeliness (~> 0.3)
306-
ms_rest_azure (0.7.0)
307-
concurrent-ruby (~> 1.0)
308-
faraday (~> 0.9)
309-
faraday-cookie_jar (~> 0.0.6)
310-
ms_rest (~> 0.6.3)
311242
msgpack (1.8.0)
312243
multi_json (1.21.1)
313244
multipart-parser (0.1.1)
@@ -574,7 +505,6 @@ GEM
574505
thor (1.5.0)
575506
tilt (2.7.0)
576507
timecop (0.9.11)
577-
timeliness (0.5.3)
578508
trailblazer-option (0.1.2)
579509
tsort (0.2.0)
580510
tzinfo (2.0.6)
@@ -585,8 +515,6 @@ GEM
585515
unicode-emoji (4.2.0)
586516
uri (1.1.1)
587517
useragent (0.16.11)
588-
vhd (0.0.4)
589-
bit-struct
590518
vmstat (2.3.1)
591519
webmock (3.26.2)
592520
addressable (>= 2.8.0)
@@ -612,7 +540,6 @@ DEPENDENCIES
612540
actionview (~> 8.1.3)
613541
activemodel (~> 8.1.2)
614542
addressable
615-
azure-storage-blob!
616543
bootsnap
617544
byebug
618545
cf-uaa-lib (~> 4.0.9)
@@ -625,7 +552,6 @@ DEPENDENCIES
625552
fluent-logger
626553
fog-aliyun
627554
fog-aws
628-
fog-azure-rm!
629555
fog-core (~> 2.6.0)
630556
fog-google (~> 1.29.4)
631557
fog-local

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ When deployed via capi-release only:
3737

3838
#### Providers
3939

40-
| Provider | `blobstore_type` | Backends | Notes |
41-
|----------|------------------|----------|-------|
42-
| Storage CLI | `storage-cli` | S3, S3-compatible, GCS, Azure, Alibaba Cloud | |
43-
| Fog | `fog` | AWS, Azure, GCS, Alibaba Cloud, OpenStack, Local/NFS | **Default.** Local/NFS not recommended for production |
44-
| WebDAV | `webdav` | WebDAV servers | |
45-
| Local | `local`, `local-temp-storage` | Filesystem, NFS | Development and testing only |
40+
| Provider | `blobstore_type` | Backends | Notes |
41+
|----------|------------------|-----------------------------------------------|-------|
42+
| Storage CLI | `storage-cli` | S3, S3-compatible, GCS, Azure, Alibaba Cloud | |
43+
| Fog | `fog` | AWS, GCS, Alibaba Cloud, OpenStack, Local/NFS | **Default.** Local/NFS not recommended for production |
44+
| WebDAV | `webdav` | WebDAV servers | |
45+
| Local | `local`, `local-temp-storage` | Filesystem, NFS | Development and testing only |
4646

4747
### Runtime
4848

‎lib/cloud_controller/blobstore/fog/providers.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
require 'fog/aws'
1111
require 'fog/local'
1212
require 'fog/google'
13-
require 'fog/azurerm'
1413
require 'fog/openstack'
1514

1615
Fog::Logger[:deprecation] = original

‎spec/unit/lib/cloud_controller/blobstore/fog/fog_client_spec.rb‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -461,33 +461,6 @@ def upload_tmpfile(client, key='abcdef')
461461
end
462462
end
463463
end
464-
465-
context 'AzureRM' do
466-
let(:az_connection_config) do
467-
{
468-
provider: 'AzureRM',
469-
environment: 'env',
470-
azure_storage_account_name: 'account',
471-
azure_storage_access_key: 'key'
472-
}
473-
end
474-
let(:client_with_encryption) do
475-
FogClient.new(connection_config: az_connection_config,
476-
directory_key: directory_key)
477-
end
478-
479-
it 'has empty storage options' do
480-
path = File.join(local_dir, 'empty_file.png')
481-
FileUtils.touch(path)
482-
483-
client_with_encryption.cp_to_blobstore(path, 'abcdef123456')
484-
485-
expect(files).to have_received(:create).with(key: anything,
486-
body: anything,
487-
content_type: anything,
488-
public: anything)
489-
end
490-
end
491464
end
492465
end
493466

0 commit comments

Comments
 (0)