Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

digitaltwins - updating to API Version 2023-01-31 / support for User Assigned Identities #22782

Merged
merged 5 commits into from
Aug 4, 2023
Merged

digitaltwins - updating to API Version 2023-01-31 / support for User Assigned Identities #22782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8af9f10
digitaltwins: updating to API Version `2023-01-31`
tombuildsstuff Aug 2, 2023
861b593
go mod tidy / go mod vendor
tombuildsstuff Aug 2, 2023
5072eb5
digitaltwins: updating to account for the changes in `2023-01-31`
tombuildsstuff Aug 2, 2023
1279f9c
r/digital_twins_instance: removing the explicit check for a UAI, sinc…
tombuildsstuff Aug 2, 2023
ef1ebcd
go mod vendor
tombuildsstuff Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions internal/services/digitaltwins/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package client
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
13 changes: 6 additions & 7 deletions internal/services/digitaltwins/digital_twins_endpoint_eventgrid_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)

func resourceDigitalTwinsEndpointEventGrid() *pluginsdk.Resource {
Expand Down Expand Up @@ -114,10 +113,10 @@ func resourceDigitalTwinsEndpointEventGridCreateUpdate(d *pluginsdk.ResourceData
payload := endpoints.DigitalTwinsEndpointResource{
Properties: &endpoints.EventGrid{
AuthenticationType: pointer.To(endpoints.AuthenticationTypeKeyBased),
TopicEndpoint: utils.String(d.Get("eventgrid_topic_endpoint").(string)),
AccessKey1: utils.String(d.Get("eventgrid_topic_primary_access_key").(string)),
AccessKey2: utils.String(d.Get("eventgrid_topic_secondary_access_key").(string)),
DeadLetterSecret: utils.String(d.Get("dead_letter_storage_secret").(string)),
TopicEndpoint: d.Get("eventgrid_topic_endpoint").(string),
AccessKey1: d.Get("eventgrid_topic_primary_access_key").(string),
AccessKey2: pointer.To(d.Get("eventgrid_topic_secondary_access_key").(string)),
DeadLetterSecret: pointer.To(d.Get("dead_letter_storage_secret").(string)),
},
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/digitaltwins/digital_twins_endpoint_eventgrid_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/digitaltwins/digital_twins_endpoint_eventhub_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/digitaltwins/digital_twins_endpoint_eventhub_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/digitaltwins/digital_twins_endpoint_servicebus_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/digitaltwins/digital_twins_endpoint_servicebus_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/digitaltwins/digital_twins_instance_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
14 changes: 9 additions & 5 deletions internal/services/digitaltwins/digital_twins_instance_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/validate"
Expand Down Expand Up @@ -57,7 +57,7 @@ func resourceDigitalTwinsInstance() *pluginsdk.Resource {
Computed: true,
},

"identity": commonschema.SystemAssignedIdentityOptional(),
"identity": commonschema.SystemAssignedUserAssignedIdentityOptional(),

"tags": commonschema.Tags(),
},
Expand All @@ -81,7 +81,7 @@ func resourceDigitalTwinsInstanceCreate(d *pluginsdk.ResourceData, meta interfac
return tf.ImportAsExistsError("azurerm_digital_twins_instance", id.ID())
}

expandedIdentity, err := identity.ExpandSystemAssigned(d.Get("identity").([]interface{}))
expandedIdentity, err := identity.ExpandLegacySystemAndUserAssignedMap(d.Get("identity").([]interface{}))
if err != nil {
return fmt.Errorf("expanding `identity`: %+v", err)
}
Expand Down Expand Up @@ -130,7 +130,11 @@ func resourceDigitalTwinsInstanceRead(d *pluginsdk.ResourceData, meta interface{
d.Set("host_name", props.HostName)
}

if err := d.Set("identity", identity.FlattenSystemAssigned(model.Identity)); err != nil {
flattenedIdentity, err := identity.FlattenLegacySystemAndUserAssignedMap(model.Identity)
if err != nil {
return fmt.Errorf("flattening `identity`: %+v", err)
}
if err := d.Set("identity", flattenedIdentity); err != nil {
return fmt.Errorf("setting `identity`: %+v", err)
}

Expand All @@ -155,7 +159,7 @@ func resourceDigitalTwinsInstanceUpdate(d *pluginsdk.ResourceData, meta interfac
props := digitaltwinsinstance.DigitalTwinsPatchDescription{}

if d.HasChange("identity") {
expandedIdentity, err := identity.ExpandSystemAssigned(d.Get("identity").([]interface{}))
expandedIdentity, err := identity.ExpandLegacySystemAndUserAssignedMap(d.Get("identity").([]interface{}))
if err != nil {
return fmt.Errorf("expanding `identity`: %+v", err)
}
Expand Down
62 changes: 57 additions & 5 deletions internal/services/digitaltwins/digital_twins_instance_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/digitaltwinsinstance"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/digitaltwinsinstance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -102,12 +102,12 @@ func TestAccDigitalTwinsInstance_update(t *testing.T) {
})
}

func TestAccDigitalTwinsInstance_identity(t *testing.T) {
func TestAccDigitalTwinsInstance_identitySystemAssigned(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_digital_twins_instance", "test")
r := DigitalTwinsInstanceResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicWithIdentity(data),
Config: r.basicWithIdentitySystemAssigned(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("identity.0.principal_id").IsUUID(),
Expand All @@ -125,7 +125,7 @@ func TestAccDigitalTwinsInstance_identity(t *testing.T) {
},
data.ImportStep(),
{
Config: r.basicWithIdentity(data),
Config: r.basicWithIdentitySystemAssigned(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("identity.0.principal_id").IsUUID(),
Expand All @@ -136,6 +136,34 @@ func TestAccDigitalTwinsInstance_identity(t *testing.T) {
})
}

func TestAccDigitalTwinsInstance_identityUserAssigned(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_digital_twins_instance", "test")
r := DigitalTwinsInstanceResource{}
data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicWithIdentityUserAssigned(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basic(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.basicWithIdentityUserAssigned(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func (DigitalTwinsInstanceResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := digitaltwinsinstance.ParseDigitalTwinsInstanceID(state.ID)
if err != nil {
Expand Down Expand Up @@ -219,7 +247,7 @@ resource "azurerm_digital_twins_instance" "test" {
`, r.template(data), data.RandomInteger)
}

func (r DigitalTwinsInstanceResource) basicWithIdentity(data acceptance.TestData) string {
func (r DigitalTwinsInstanceResource) basicWithIdentitySystemAssigned(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

Expand All @@ -233,3 +261,27 @@ resource "azurerm_digital_twins_instance" "test" {
}
`, r.template(data), data.RandomInteger)
}

func (r DigitalTwinsInstanceResource) basicWithIdentityUserAssigned(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s

resource "azurerm_user_assigned_identity" "test" {
name = "acctest%[2]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
}

resource "azurerm_digital_twins_instance" "test" {
name = "acctest-DT-%[2]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
identity {
type = "UserAssigned"
identity_ids = [
azurerm_user_assigned_identity.test.id
]
}
}
`, r.template(data), data.RandomInteger)
}
4 changes: 2 additions & 2 deletions internal/services/digitaltwins/digital_twins_time_series_database_connection_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/eventhub/2021-11-01/eventhubs"
"github.com/hashicorp/go-azure-sdk/resource-manager/kusto/2023-05-02/clusters"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
Expand Down Expand Up @@ -253,7 +253,7 @@ func (m TimeSeriesDatabaseConnectionResource) Delete() sdk.ResourceFunc {
}

client := meta.Client.DigitalTwins.TimeSeriesDatabaseConnectionsClient
if err = client.DeleteThenPoll(ctx, *id); err != nil {
if err = client.DeleteThenPoll(ctx, *id, timeseriesdatabaseconnections.DefaultDeleteOperationOptions()); err != nil {
return fmt.Errorf("deleting %s: %+v", id, err)
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/services/digitaltwins/digital_twins_time_series_database_connection_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2022-10-31/timeseriesdatabaseconnections"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/timeseriesdatabaseconnections"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/digitaltwins/endpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2020-12-01/endpoints"
"github.com/hashicorp/go-azure-sdk/resource-manager/digitaltwins/2023-01-31/endpoints"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
Expand Down
18 changes: 0 additions & 18 deletions ...rce-manager/digitaltwins/2020-12-01/digitaltwinsinstance/model_digitaltwinsdescription.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...e-manager/digitaltwins/2020-12-01/digitaltwinsinstance/model_privateendpointconnection.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...2020-12-01/digitaltwinsinstance/README.md → ...2023-01-31/digitaltwinsinstance/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...2020-12-01/digitaltwinsinstance/client.go → ...2023-01-31/digitaltwinsinstance/client.go
View file
Open in desktop
File renamed without changes.
0 ...0-12-01/digitaltwinsinstance/constants.go → ...3-01-31/digitaltwinsinstance/constants.go
View file
Open in desktop
File renamed without changes.
0 ...ltwinsinstance/id_digitaltwinsinstance.go → ...ltwinsinstance/id_digitaltwinsinstance.go
View file
Open in desktop
File renamed without changes.
0 ...ance/method_digitaltwinscreateorupdate.go → ...ance/method_digitaltwinscreateorupdate.go
View file
Open in desktop
File renamed without changes.
0 ...winsinstance/method_digitaltwinsdelete.go → ...winsinstance/method_digitaltwinsdelete.go
View file
Open in desktop
File renamed without changes.
0 ...altwinsinstance/method_digitaltwinsget.go → ...altwinsinstance/method_digitaltwinsget.go
View file
Open in desktop
File renamed without changes.
0 ...ltwinsinstance/method_digitaltwinslist.go → ...ltwinsinstance/method_digitaltwinslist.go
View file
Open in desktop
File renamed without changes.
0 ...method_digitaltwinslistbyresourcegroup.go → ...method_digitaltwinslistbyresourcegroup.go
View file
Open in desktop
File renamed without changes.
0 ...winsinstance/method_digitaltwinsupdate.go → ...winsinstance/method_digitaltwinsupdate.go
View file
Open in desktop
File renamed without changes.
0 ...insinstance/model_connectionproperties.go → ...insinstance/model_connectionproperties.go
View file
Open in desktop
File renamed without changes.
0 ...taltwinsinstance/model_connectionstate.go → ...taltwinsinstance/model_connectionstate.go
View file
Open in desktop
File renamed without changes.
20 changes: 20 additions & 0 deletions ...rce-manager/digitaltwins/2023-01-31/digitaltwinsinstance/model_digitaltwinsdescription.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...nce/model_digitaltwinspatchdescription.go → ...nce/model_digitaltwinspatchdescription.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ance/model_digitaltwinspatchproperties.go → ...ance/model_digitaltwinspatchproperties.go
View file
Open in desktop
File renamed without changes.
0 ...sinstance/model_digitaltwinsproperties.go → ...sinstance/model_digitaltwinsproperties.go
View file
Open in desktop
File renamed without changes.
0 ...taltwinsinstance/model_privateendpoint.go → ...taltwinsinstance/model_privateendpoint.go
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ...e-manager/digitaltwins/2023-01-31/digitaltwinsinstance/model_privateendpointconnection.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...-12-01/digitaltwinsinstance/predicates.go → ...-01-31/digitaltwinsinstance/predicates.go
View file
Open in desktop
File renamed without changes.
Loading
Loading