Skip to content

Commit

Permalink
Merge branch 'main' into feature-user-datasource
Browse files Browse the repository at this point in the history
  • Loading branch information
taohe1012 authored Jul 28, 2023
2 parents 5a72b83 + 070a35d commit fb919f1
Show file tree
Hide file tree
Showing 32 changed files with 167,833 additions and 555 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/terraform-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Run the forbidden words scan
uses: dell/common-github-actions/code-sanitizer@main
with:
args: /github/workspace
args: /github/workspace/powerscale

build:
name: Build
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ website/vendor

# Keep windows files with windows line endings
*.winfile eol=crlf

*coverage.out*
*powerscale-go-client
terraform-provider-powerscale
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
---
# Copyright (c) 2023 Dell Inc., or its subsidiaries. All Rights Reserved.
#
# Licensed under the Mozilla Public License Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://mozilla.org/MPL/2.0/
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
---

## 0.1.0 (Unreleased)

FEATURES:
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<!--
Copyright (c) 2023 Dell Inc., or its subsidiaries. All Rights Reserved.
---
# Copyright (c) 2023 Dell Inc., or its subsidiaries. All Rights Reserved.
#
# Licensed under the Mozilla Public License Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://mozilla.org/MPL/2.0/
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
---
## 0.1.0 (Unreleased)

Licensed under the Mozilla Public License Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://mozilla.org/MPL/2.0/
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
# Terraform Provider for Dell Technologies PowerScale
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](about/CODE_OF_CONDUCT.md)
[![License](https://img.shields.io/badge/License-MPL_2.0-blue.svg)](LICENSE)
Expand Down
4 changes: 2 additions & 2 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"context"
"crypto/tls"
"crypto/x509"
"dell/powerscale-go-client"
powerscale "dell/powerscale-go-client"
"encoding/base64"
"errors"
"fmt"
Expand Down Expand Up @@ -92,7 +92,7 @@ func NewOpenAPIClient(ctx context.Context, endpoint string, insecure bool, verbo
}

httpclient := &http.Client{
Timeout: (2000 * time.Second),
Timeout: 2000 * time.Second,
Jar: jar,
}
if insecure {
Expand Down
Loading

0 comments on commit fb919f1

Please sign in to comment.